Ticket #1619: check-tsid.diff

libs/libmythtv/mpeg/mpegstreamdata.cpp

@@ -392 +392 @@
 
     if (TableID::PAT == table_id)
     {
-        if (VersionPAT() != version)
+        if ((GetPATTransportID() != psip.TableIDExtension()) ||
+            (VersionPAT() != version))
             return false;
         return PATSectionSeen(psip.Section());
     }
@@ -425 +426 @@
         case TableID::PAT:
         { 
             SetVersionPAT(version, psip.LastSection());
+            SetPATTransportID(psip.TableIDExtension());
             SetPATSectionSeen(psip.Section());
             ProgramAssociationTable pat(psip);
 

libs/libmythtv/mpeg/mpegstreamdata.h

@@ -84 +84 @@
     }
     int  VersionPAT(void) const { return _pat_version; }
 
+    void SetPATTransportID(int tsid) { _pat_transport = tsid; }
+    int  GetPATTransportID(void) const { return _pat_transport; }
+
     void SetVersionPMT(uint program_num, int version, uint last_section)
     {
         if (VersionPMT(program_num) == version)
@@ -202 +205 @@
     int                       _pat_version;
     QMap<uint, int>           _pmt_version;
 
+    int                       _pat_transport;
+
     sections_t                _pat_section_seen;
     sections_map_t            _pmt_section_seen;