EIT: Add 'EIT - skip TSID check' per mux settings, fixes #2858

tvheadend · Sep 21, 2015 · 32a2d9c · 32a2d9c
1 parent f63a8fd
commit 32a2d9c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/src/epggrab/module/eit.c b/src/epggrab/module/eit.c
@@ -644,7 +644,8 @@ _eit_callback
     if (mm->mm_tsid != tsid ||
         mm->mm_onid != onid) {
       if (mm->mm_onid != MPEGTS_ONID_NONE &&
-          mm->mm_tsid != MPEGTS_TSID_NONE)
+          mm->mm_tsid != MPEGTS_TSID_NONE &&
+          !mm->mm_eit_tsid_nocheck)
         tvhtrace("eit",
                 "invalid tsid found tid 0x%02X, onid:tsid %d:%d != %d:%d",
                 tableid, mm->mm_onid, mm->mm_tsid, onid, tsid);

diff --git a/src/input/mpegts.h b/src/input/mpegts.h
@@ -480,6 +480,7 @@ struct mpegts_mux
   int   mm_epg;
   char *mm_charset;
   int   mm_pmt_ac3;
+  int   mm_eit_tsid_nocheck;
 
   /*
    * TSDEBUG

diff --git a/src/input/mpegts/mpegts_mux.c b/src/input/mpegts/mpegts_mux.c
@@ -594,6 +594,14 @@ const idclass_t mpegts_mux_class =
       .off      = offsetof(mpegts_mux_t, mm_pmt_ac3),
       .def.i    = MM_AC3_STANDARD,
       .list     = mpegts_mux_ac3_list,
+      .opts     = PO_HIDDEN | PO_ADVANCED
+    },
+    {
+      .type     = PT_BOOL,
+      .id       = "eit_tsid_nocheck",
+      .name     = N_("EIT - skip TSID check"),
+      .off      = offsetof(mpegts_mux_t, mm_eit_tsid_nocheck),
+      .opts     = PO_HIDDEN | PO_ADVANCED
     },
     {}
   }