tsfix: fix DVBSUB again - a wrong time reference was used to check

tvheadend · Oct 17, 2015 · 091c10d · 091c10d
1 parent 46c82a8
commit 091c10d
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/src/plumbing/tsfix.c b/src/plumbing/tsfix.c
@@ -456,20 +456,22 @@ tsfix_input_packet(tsfix_t *tf, streaming_message_t *sm)
         tfs->tfs_local_ref = tf->tf_tsref;
       }
     } else if (tfs->tfs_type == SCT_DVBSUB) {
-      diff = tsfix_ts_diff(tf->tf_tsref, pkt->pkt_dts);
-      if (diff > 2 * 90000) {
-        LIST_FOREACH(tfs2, &tf->tf_streams, tfs_link) {
-          if(tfs2->tfs_audio && tfs2->tfs_local_ref != PTS_UNSET) {
+      /* find first valid audio stream and check the dts timediffs */
+      LIST_FOREACH(tfs2, &tf->tf_streams, tfs_link)
+        if(tfs2->tfs_audio && tfs2->tfs_last_dts_in != PTS_UNSET) {
+          diff = tsfix_ts_diff(tfs2->tfs_last_dts_in, pkt->pkt_dts);
+          if (diff > 2 * 90000) {
             tvhwarn("parser", "The timediff for DVBSUB is big (%"PRId64"), using audio dts", diff);
             tfs->tfs_parent = tfs2;
-            break;
+            tfs->tfs_local_ref = tfs2->tfs_local_ref;
+          } else {
+            tfs->tfs_local_ref = tf->tf_tsref;
           }
+          break;
         }
-        if (tfs2 == NULL) {
-          pkt_ref_dec(pkt);
-          return;
-        }
-        tfs->tfs_local_ref = tfs2->tfs_local_ref;
+      if (tfs2 == NULL) {
+        pkt_ref_dec(pkt);
+        return;
       }
     } else if (tfs->tfs_type == SCT_TELETEXT) {
       diff = tsfix_ts_diff(tf->tf_tsref, pkt->pkt_dts);