Ticket #4632: passiveeit.patch

libs/libmythtv/dvbstreamhandler.cpp

@@ -177 +177 @@
 void DVBStreamHandler::Start(void)
 {
     QMutexLocker locker(&_start_stop_lock);
+    _eit_pids.clear();
 
     if (IsRunning() && _using_section_reader && !_allow_section_reader)
         Stop();

libs/libmythtv/mpeg/dvbstreamdata.cpp

@@ -108 +108 @@
     if (is_eit)
     {
         uint service_id = psip.TableIDExtension();
-        if (VersionEIT(table_id, service_id) != version)
+        uint section_id = psip.Section();
+        if (VersionEIT(table_id, service_id, section_id) != version)
             return false;
-        return EITSectionSeen(table_id, service_id, psip.Section());
+        return EITSectionSeen(table_id, service_id, section_id);
     }
 
     ////////////////////////////////////////////////////////////////////////
@@ -147 +148 @@
     if (is_eit)
     {
         uint service_id = psip.TableIDExtension();
-        if (VersionEIT(table_id, service_id) != version)
+        uint section_id = psip.Section();
+        if (VersionEIT(table_id, service_id, section_id) != version)
             return false;
-        return EITSectionSeen(table_id, service_id, psip.Section());
+        return EITSectionSeen(table_id, service_id, section_id);
     }
 
     if (PREMIERE_EIT_DIREKT_PID == pid || PREMIERE_EIT_SPORT_PID == pid
@@ -335 +337 @@
             return true;
 
         uint service_id = psip.TableIDExtension();
-        SetVersionEIT(psip.TableID(), service_id, psip.Version());
-        SetEITSectionSeen(psip.TableID(), service_id, psip.Section());
+        uint section_id = psip.Section();
+        SetVersionEIT(psip.TableID(), service_id, section_id, psip.Version());
+        SetEITSectionSeen(psip.TableID(), service_id, section_id);
 
         DVBEventInformationTable eit(psip);
         for (uint i = 0; i < _dvb_eit_listeners.size(); i++)

libs/libmythtv/mpeg/dvbstreamdata.h

@@ -97 +97 @@
         return *it;
     }
 
-    void SetVersionEIT(uint tableid, uint serviceid, int version)
+    void SetVersionEIT(uint tableid, uint serviceid, uint sectionid, int version)
     {
-        if (VersionEIT(tableid, serviceid) == version)
+        if (VersionEIT(tableid, serviceid, sectionid) == version)
             return;
-        uint key = (tableid << 16) | serviceid;
+        uint key = (sectionid << 24) | (tableid << 16) | serviceid;
         _eit_version[key] = version;
     }
 
-    int VersionEIT(uint tableid, uint serviceid) const
+    int VersionEIT(uint tableid, uint serviceid, uint sectionid) const
     {
-        uint key = (tableid << 16) | serviceid;
+        uint key = (sectionid << 24) | (tableid << 16) | serviceid;
         const QMap<uint, int>::const_iterator it = _eit_version.find(key);
         if (it == _eit_version.end())
             return -1;