[bug fix] stream conver publisher trigger relay push twice

AlexWoo · AlexWoo · commit 2d1f414fd234 · 2019-03-04T14:17:41.000+08:00
diff --git a/ngx_live_relay.c b/ngx_live_relay.c
@@ -206,6 +206,11 @@ ngx_live_relay_publish(ngx_rtmp_session_t *s, ngx_rtmp_publish_t *v)
 {
     ngx_live_relay_ctx_t       *ctx;
 
+    // second publish will not trigger push
+    if (s->live_stream->publish_ctx->next != NULL) {
+        goto next;
+    }
+
     if (ngx_live_push(s) != NGX_OK) {
         return NGX_ERROR;
     }

Original file line number	Diff line number	Diff line change
`@@ -206,6 +206,11 @@ ngx_live_relay_publish(ngx_rtmp_session_t s, ngx_rtmp_publish_t v)`
`206`	`206`	`{`
`207`	`207`	`ngx_live_relay_ctx_t *ctx;`
`208`	`208`
	`209`	`+ // second publish will not trigger push`
	`210`	`+ if (s->live_stream->publish_ctx->next != NULL) {`
	`211`	`+ goto next;`
	`212`	`+ }`
	`213`	`+`
`209`	`214`	`if (ngx_live_push(s) != NGX_OK) {`
`210`	`215`	`return NGX_ERROR;`
`211`	`216`	`}`