plumbing plugins: multiple SMT_START might occur when filtered compon…

…ents are empty
tvheadend · Oct 13, 2016 · bf75b27 · bf75b27
1 parent 3cd2a5b
commit bf75b27
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/src/plumbing/globalheaders.c b/src/plumbing/globalheaders.c
@@ -329,7 +329,8 @@ gh_hold(globalheaders_t *gh, streaming_message_t *sm)
     break;
 
   case SMT_START:
-    assert(gh->gh_ss == NULL);
+    if (gh->gh_ss)
+      gh_flush(gh);
     gh_start(gh, sm);
     break;
 

diff --git a/src/plumbing/transcoding.c b/src/plumbing/transcoding.c
@@ -2033,6 +2033,7 @@ transcoder_input(void *opaque, streaming_message_t *sm)
     break;
 
   case SMT_START:
+    transcoder_stop(t);
     ss = transcoder_start(t, sm->sm_data);
     streaming_start_unref(sm->sm_data);
     sm->sm_data = ss;

diff --git a/src/plumbing/tsfix.c b/src/plumbing/tsfix.c
@@ -574,6 +574,7 @@ tsfix_input(void *opaque, streaming_message_t *sm)
     return;
 
   case SMT_START:
+    tsfix_stop(tf);
     tsfix_start(tf, sm->sm_data);
     if (tf->tf_wait_for_video) {
       streaming_msg_free(sm);