Ticket #11098: mythtv_remove_code_duplication_in_mpeg_table_accounting.patch

mythtv/libs/libmythtv/libmythtv.pro

@@ -183 +183 @@
 HEADERS += mpeg/iso6937tables.h
 HEADERS += mpeg/tsstats.h           mpeg/streamlisteners.h
 HEADERS += mpeg/H264Parser.h
+HEADERS += mpeg/TableStatus.h
 
 SOURCES += mpeg/tspacket.cpp        mpeg/pespacket.cpp
 SOURCES += mpeg/mpegtables.cpp      mpeg/atsctables.cpp
@@ -198 +199 @@
 SOURCES += mpeg/freesat_huffman.cpp
 SOURCES += mpeg/iso6937tables.cpp
 SOURCES += mpeg/H264Parser.cpp
+SOURCES += mpeg/TableStatus.cpp
 
 # Channels, and the multiplexes that transmit them
 HEADERS += frequencies.h            frequencytables.h

new file mythtv/libs/libmythtv/mpeg/TableStatus.cpp

@@ +1 @@
+// -*- Mode: c++ -*-
+// Copyright (c) 2003-2012
+
+#include "TableStatus.h"
+
+#define BIT_SEL(x) (1<(x))
+
+void TableStatus::InitSections(sections_t &sect, uint32_t last_section)
+{
+    static const unsigned char init_bits[8] =
+        { 0xfe, 0xfc, 0xf8, 0xf0, 0xe0, 0xc0, 0x80, 0x00, };
+
+    sect.clear();
+
+    uint endz = last_section >> 3;
+    if (endz)
+        sect.resize(endz, 0x00);
+    sect.resize(32, 0xff);
+    sect[endz] = init_bits[last_section & 0x7];
+
+#if 0
+    {
+        QString msg = QString("init_sections ls(%1): ").arg(last_section);
+        for (uint i = 0 ; i < 32; i++)
+            msg += QString("%1 ").arg((int)sect[i], 0, 16);
+        LOG(VB_GENERAL, LOG_DEBUG, msg);
+    }
+#endif
+}
+void TableStatus::SetVersion(int32_t version, uint32_t last_section)
+{
+    if (m_version == version)
+        return;
+
+    m_version = version;
+    InitSections(m_sections, last_section);
+}
+
+void TableStatus::SetSectionSeen(int32_t version, uint32_t section, uint32_t last_section)
+{
+    SetVersion(version, last_section);
+    m_sections[section>>3] |= BIT_SEL(section & 0x7);
+}
+
+bool TableStatus::IsSectionSeen(int32_t version, uint32_t section) const
+{
+    if (m_version != version)
+        return false;
+
+    return (bool) (m_sections[section>>3] & BIT_SEL(section & 0x7));
+}
+
+bool TableStatus::HasAllSections() const
+{
+    for (uint32_t i = 0; i < 32; i++)
+        if (m_sections[i] != 0xff)
+            return false;
+    return true;
+}
+
+
+void TableStatusMap::SetVersion(uint32_t key, int32_t version, uint32_t last_section)
+{
+    TableStatus &status = (*this)[key];
+    //NOTE: relies on status.m_version beeing invalid(-2) if a new entry was just added to the map
+    status.SetVersion(version, last_section);
+}
+
+void TableStatusMap::SetSectionSeen(uint32_t key, int32_t version, uint32_t section, uint32_t last_section)
+{
+    TableStatus &status = (*this)[key];
+    //NOTE: relies on status.m_version beeing invalid(-2) if a new entry was just added to the map
+    status.SetSectionSeen(version, section, last_section);
+}
+
+bool TableStatusMap::IsSectionSeen(uint32_t key, int32_t version, uint32_t section) const
+{
+    const_iterator it = this->find(key);
+    if (it == this->end() || it->m_version != version)
+        return false;
+    return (bool) (it->m_sections[section>>3] & BIT_SEL(section & 0x7));
+}
+
+bool TableStatusMap::HasAllSections(uint32_t key) const
+{
+    const_iterator it = this->find(key);
+    if (it == this->end())
+        return false;
+
+    return it->HasAllSections();
+}
+

new file mythtv/libs/libmythtv/mpeg/TableStatus.h

@@ +1 @@
+// -*- Mode: c++ -*-
+// Copyright (c) 2003-2012
+#ifndef TABLESTATUS_H_
+#define TABLESTATUS_H_
+
+// POSIX
+#include <stdint.h>  // uint64_t
+
+// C++
+#include <vector>
+using namespace std;
+
+// Qt
+#include <QMap>
+
+class TableStatus
+{
+public:
+    typedef vector<uint8_t>   sections_t;
+    static void InitSections(sections_t &sect, uint32_t last_section);
+
+    TableStatus() : m_version(-2) {}
+    void SetVersion(int32_t version, uint32_t last_section);
+    void SetSectionSeen(int32_t version, uint32_t section, uint32_t last_section);
+    bool IsSectionSeen(int32_t version, uint32_t section) const;
+    bool HasAllSections() const;
+
+    int32_t     m_version;
+    sections_t  m_sections;
+};
+
+class TableStatusMap : public QMap<uint32_t, TableStatus>
+{
+public:
+    void SetVersion(uint32_t key, int32_t version, uint32_t last_section);
+    void SetSectionSeen(uint32_t key, int32_t version, uint32_t section, uint32_t last_section);
+    bool IsSectionSeen(uint32_t key, int32_t version, uint32_t section) const;
+    bool HasAllSections(uint32_t key) const;
+};
+
+#endif // TABLESTATUS_H_
+

mythtv/libs/libmythtv/mpeg/atscstreamdata.cpp

@@ -125 +125 @@
     _mgt_version = -1;
     _tvct_version.clear();
     _cvct_version.clear();
-    _eit_version.clear();
-    _eit_section_seen.clear();
+    _eit_status.clear();
 
     _sourceid_to_atsc_maj_min.clear();
     _atsc_eit_pids.clear();
@@ -169 +168 @@
 
     if (TableID::EIT == table_id)
     {
-        if (VersionEIT(pid, psip.TableIDExtension()) != version)
-            return false;
-        return EITSectionSeen(pid, psip.TableIDExtension(), psip.Section());
+        uint key = (pid<<16) | psip.TableIDExtension();
+        return _eit_status.IsSectionSeen(key, version, psip.Section());
     }
 
     if (TableID::ETT == table_id)
@@ -289 +287 @@
             if (!_atsc_eit_listeners.size() && !_eit_helper)
                 return true;
 
-            if (VersionEIT(pid, psip.TableIDExtension()) != version)
-                SetVersionEIT(pid, psip.TableIDExtension(), version);
-            SetEITSectionSeen(pid, psip.TableIDExtension(), psip.Section());
+            uint key = (pid<<16) | psip.TableIDExtension();
+            _eit_status.SetSectionSeen(key, version, psip.Section(), psip.LastSection());
 
             EventInformationTable eit(psip);
             for (uint i = 0; i < _atsc_eit_listeners.size(); i++)
@@ -483 +480 @@
     return false;
 }
 
-void ATSCStreamData::SetEITSectionSeen(uint pid, uint atsc_source_id,
-                                       uint section)
-{
-    uint key = (pid<<16) | atsc_source_id;
-    sections_map_t::iterator it = _eit_section_seen.find(key);
-    if (it == _eit_section_seen.end())
-    {
-        _eit_section_seen[key].resize(32, 0);
-        it = _eit_section_seen.find(key);
-    }
-    (*it)[section>>3] |= bit_sel[section & 0x7];
-}
-
-bool ATSCStreamData::EITSectionSeen(uint pid, uint atsc_source_id,
-                                    uint section) const
-{
-    uint key = (pid<<16) | atsc_source_id;
-    sections_map_t::const_iterator it = _eit_section_seen.find(key);
-    if (it == _eit_section_seen.end())
-        return false;
-    return (bool) ((*it)[section>>3] & bit_sel[section & 0x7]);
-}
-
 bool ATSCStreamData::HasEITPIDChanges(const uint_vec_t &in_use_pids) const
 {
     QMutexLocker locker(&_listener_lock);

mythtv/libs/libmythtv/mpeg/atscstreamdata.h

@@ -60 +60 @@
         { _cvct_version[tsid] = version; }
     void SetVersionRRT(uint region, int version)
         { _rrt_version[region&0xff] = version; }
-    void SetVersionEIT(uint pid, uint atsc_source_id, int version)
-    {
-        if (VersionEIT(pid, atsc_source_id) == version)
-            return;
-        uint key = (pid<<16) | atsc_source_id;
-        _eit_version[key] = version;
-        _eit_section_seen[key].clear();
-        _eit_section_seen[key].resize(32, 0);
-    }
-    void SetEITSectionSeen(uint pid, uint atsc_source_id, uint section);
 
     int VersionMGT() const { return _mgt_version; }
     inline int VersionTVCT(uint tsid) const;
     inline int VersionCVCT(uint tsid) const;
     inline int VersionRRT(uint region) const;
-    inline int VersionEIT(uint pid, uint atsc_sourceid) const;
-    bool EITSectionSeen(uint pid, uint atsc_source_id, uint section) const;
 
     // Caching
     bool HasCachedMGT(bool current = true) const;
@@ -155 +143 @@
     QMap<uint, int> _tvct_version;
     QMap<uint, int> _cvct_version;
     QMap<uint, int> _rrt_version;
-    QMap<uint, int> _eit_version;
-    sections_map_t  _eit_section_seen;
+    TableStatusMap  _eit_status;
 
     // Caching
     mutable MasterGuideTable *_cached_mgt;
@@ -205 +192 @@
     return *it;
 }
 
-inline int ATSCStreamData::VersionEIT(uint pid, uint atsc_source_id) const
-{
-    uint key = (pid<<16) | atsc_source_id;
-    const QMap<uint, int>::const_iterator it = _eit_version.find(key);
-    if (it == _eit_version.end())
-        return -1;
-    return *it;
-}
-
 #endif

mythtv/libs/libmythtv/mpeg/dvbstreamdata.cpp

@@ -14 +14 @@
 #define MCA_EIT_TSID 136
 #define MCA_EIT_PID 1018
 
+
 // service_id is synonymous with the MPEG program number in the PMT.
 DVBStreamData::DVBStreamData(uint desired_netid,  uint desired_tsid,
                              int desired_program, bool cacheTables)
     : MPEGStreamData(desired_program, cacheTables),
       _desired_netid(desired_netid), _desired_tsid(desired_tsid),
-      _dvb_eit_dishnet_long(false),
-      _nit_version(-2), _nito_version(-2)
+      _dvb_eit_dishnet_long(false)
 {
-    SetVersionNIT(-1,0);
-    SetVersionNITo(-1,0);
+    _nit_status.SetVersion(-1,0);
+    _nito_status.SetVersion(-1,0);
     AddListeningPID(DVB_NIT_PID);
     AddListeningPID(DVB_SDT_PID);
     AddListeningPID(DVB_TDT_PID);
@@ -85 +85 @@
 
     if (TableID::NIT == table_id)
     {
-        if (VersionNIT() != version)
-            return false;
-        return NITSectionSeen(psip.Section());
+        return _nit_status.IsSectionSeen(version, psip.Section());
     }
 
     if (TableID::SDT == table_id)
     {
-        if (VersionSDT(psip.TableIDExtension()) != version)
-            return false;
-        return SDTSectionSeen(psip.TableIDExtension(), psip.Section());
+        return _sdt_status.IsSectionSeen(psip.TableIDExtension(), version, psip.Section());
     }
 
     if (TableID::TDT == table_id)
@@ -102 +98 @@
 
     if (TableID::BAT == table_id)
     {
-        if (VersionBAT(psip.TableIDExtension()) != version)
-            return false;
-        return BATSectionSeen(psip.TableIDExtension(), psip.Section());
+        return _bat_status.IsSectionSeen(psip.TableIDExtension(), version, psip.Section());
     }
 
     bool is_eit = false;
@@ -119 +113 @@
     if (is_eit)
     {
         uint service_id = psip.TableIDExtension();
-        if (VersionEIT(table_id, service_id) != version)
-            return false;
-        return EITSectionSeen(table_id, service_id, psip.Section());
+        uint key = (table_id<<16) | service_id;
+        return _eit_status.IsSectionSeen(key, version, psip.Section());
     }
 
     ////////////////////////////////////////////////////////////////////////
@@ -129 +122 @@
 
     if (TableID::NITo == table_id)
     {
-        if (VersionNITo() != version)
-            return false;
-        return NIToSectionSeen(psip.Section());
+        return _nito_status.IsSectionSeen(version, psip.Section());
     }
 
     if (TableID::SDTo == table_id)
     {
-        if (VersionSDTo(psip.TableIDExtension()) != version)
-            return false;
-        return SDToSectionSeen(psip.TableIDExtension(), psip.Section());
+        return _sdto_status.IsSectionSeen(psip.TableIDExtension(), version, psip.Section());
     }
 
     if (DVB_EIT_PID == pid || FREESAT_EIT_PID == pid || MCA_EIT_PID == pid)
@@ -159 +148 @@
     if (is_eit)
     {
         uint service_id = psip.TableIDExtension();
-        if (VersionEIT(table_id, service_id) != version)
-            return false;
-        return EITSectionSeen(table_id, service_id, psip.Section());
+        uint key = (table_id<<16) | service_id;
+        return _eit_status.IsSectionSeen(key, version, psip.Section());
     }
 
     if (((PREMIERE_EIT_DIREKT_PID == pid) || (PREMIERE_EIT_SPORT_PID == pid)) &&
         TableID::PREMIERE_CIT == table_id)
     {
         uint content_id = PremiereContentInformationTable(psip).ContentID();
-        if (VersionCIT(content_id) != version)
-            return false;
-        return CITSectionSeen(content_id, psip.Section());
+        return _cit_status.IsSectionSeen(content_id, version, psip.Section());
     }
 
     return false;
@@ -184 +170 @@
     _desired_netid = desired_netid;
     _desired_tsid  = desired_tsid;
 
-    SetVersionNIT(-1,0);
-    _sdt_versions.clear();
-    _sdt_section_seen.clear();
-    _eit_version.clear();
-    _eit_section_seen.clear();
-    _cit_version.clear();
-    _cit_section_seen.clear();
+    _nit_status.SetVersion(-1,0);
+    _sdt_status.clear();
+    _eit_status.clear();
+    _cit_status.clear();
 
-    SetVersionNITo(-1,0);
-    _sdto_versions.clear();
-    _sdto_section_seen.clear();
-    _bat_versions.clear();
-    _bat_section_seen.clear();
+    _nito_status.SetVersion(-1,0);
+    _sdto_status.clear();
+    _bat_status.clear();
 
     {
         _cache_lock.lock();
@@ -234 +215 @@
     {
         case TableID::NIT:
         {
-            SetVersionNIT(psip.Version(), psip.LastSection());
-            SetNITSectionSeen(psip.Section());
+            _nit_status.SetSectionSeen(psip.Version(), psip.Section(), psip.LastSection());
 
             if (_cache_tables)
             {
@@ -259 +239 @@
         case TableID::SDT:
         {
             uint tsid = psip.TableIDExtension();
-            SetVersionSDT(tsid, psip.Version(), psip.LastSection());
-            SetSDTSectionSeen(tsid, psip.Section());
+            _sdt_status.SetSectionSeen(tsid, psip.Version(), psip.Section(), psip.LastSection());
 
             if (_cache_tables)
             {
@@ -291 +270 @@
         }
         case TableID::NITo:
         {
-            SetVersionNITo(psip.Version(), psip.LastSection());
-            SetNIToSectionSeen(psip.Section());
+            _nito_status.SetSectionSeen(psip.Version(), psip.Section(), psip.LastSection());
             NetworkInformationTable nit(psip);
 
             QMutexLocker locker(&_listener_lock);
@@ -304 +282 @@
         case TableID::SDTo:
         {
             uint tsid = psip.TableIDExtension();
-            SetVersionSDTo(tsid, psip.Version(), psip.LastSection());
-            SetSDToSectionSeen(tsid, psip.Section());
+            _sdto_status.SetSectionSeen(tsid, psip.Version(), psip.Section(), psip.LastSection());
             ServiceDescriptionTable sdt(psip);
 
             // some providers send the SDT for the current multiplex as SDTo
@@ -342 +319 @@
         case TableID::BAT:
         {
             uint bid = psip.TableIDExtension();
-            SetVersionBAT(bid, psip.Version(), psip.LastSection());
-            SetBATSectionSeen(bid, psip.Section());
+            _bat_status.SetSectionSeen(bid, psip.Version(), psip.Section(), psip.LastSection());
             BouquetAssociationTable bat(psip);
 
             QMutexLocker locker(&_listener_lock);
@@ -365 +341 @@
             return true;
 
         uint service_id = psip.TableIDExtension();
-        SetVersionEIT(psip.TableID(), service_id, psip.Version(),  psip.LastSection());
-        SetEITSectionSeen(psip.TableID(), service_id, psip.Section());
+        uint key = (psip.TableID()<<16) | service_id;
+        _eit_status.SetSectionSeen(key, psip.Version(), psip.Section(), psip.LastSection());
 
         DVBEventInformationTable eit(psip);
         for (uint i = 0; i < _dvb_eit_listeners.size(); i++)
@@ -387 +363 @@
             return true;
 
         PremiereContentInformationTable cit(psip);
-        SetVersionCIT(cit.ContentID(), cit.Version());
-        SetCITSectionSeen(cit.ContentID(), cit.Section());
+        _cit_status.SetSectionSeen(cit.ContentID(), psip.Version(), psip.Section(), psip.LastSection());
 
         for (uint i = 0; i < _dvb_eit_listeners.size(); i++)
             _dvb_eit_listeners[i]->HandleEIT(&cit);
@@ -533 +508 @@
     return add_pids.size() || del_pids.size();
 }
 
-void DVBStreamData::SetNITSectionSeen(uint section)
-{
-    _nit_section_seen[section>>3] |= bit_sel[section & 0x7];
-}
-
-bool DVBStreamData::NITSectionSeen(uint section) const
-{
-    return (bool) (_nit_section_seen[section>>3] & bit_sel[section & 0x7]);
-}
-
 bool DVBStreamData::HasAllNITSections(void) const
 {
-    for (uint i = 0; i < 32; i++)
-        if (_nit_section_seen[i] != 0xff)
-            return false;
-    return true;
-}
-
-void DVBStreamData::SetNIToSectionSeen(uint section)
-{
-    _nito_section_seen[section>>3] |= bit_sel[section & 0x7];
-}
-
-bool DVBStreamData::NIToSectionSeen(uint section) const
-{
-    return (bool) (_nito_section_seen[section>>3] & bit_sel[section & 0x7]);
+    return _nit_status.HasAllSections();
 }
 
 bool DVBStreamData::HasAllNIToSections(void) const
 {
-    for (uint i = 0; i < 32; i++)
-        if (_nito_section_seen[i] != 0xff)
-            return false;
-    return true;
-}
-
-void DVBStreamData::SetSDTSectionSeen(uint tsid, uint section)
-{
-    sections_map_t::iterator it = _sdt_section_seen.find(tsid);
-    if (it == _sdt_section_seen.end())
-    {
-        _sdt_section_seen[tsid].resize(32, 0);
-        it = _sdt_section_seen.find(tsid);
-    }
-    (*it)[section>>3] |= bit_sel[section & 0x7];
-}
-
-bool DVBStreamData::SDTSectionSeen(uint tsid, uint section) const
-{
-    sections_map_t::const_iterator it = _sdt_section_seen.find(tsid);
-    if (it == _sdt_section_seen.end())
-        return false;
-    return (bool) ((*it)[section>>3] & bit_sel[section & 0x7]);
+    return _nito_status.HasAllSections();
 }
 
 bool DVBStreamData::HasAllSDTSections(uint tsid) const
 {
-    sections_map_t::const_iterator it = _sdt_section_seen.find(tsid);
-    if (it == _sdt_section_seen.end())
-        return false;
-    for (uint i = 0; i < 32; i++)
-        if ((*it)[i] != 0xff)
-            return false;
-    return true;
-}
-
-void DVBStreamData::SetSDToSectionSeen(uint tsid, uint section)
-{
-    sections_map_t::iterator it = _sdto_section_seen.find(tsid);
-    if (it == _sdto_section_seen.end())
-    {
-        _sdto_section_seen[tsid].resize(32, 0);
-        it = _sdto_section_seen.find(tsid);
-    }
-    (*it)[section>>3] |= bit_sel[section & 0x7];
-}
-
-bool DVBStreamData::SDToSectionSeen(uint tsid, uint section) const
-{
-    sections_map_t::const_iterator it = _sdto_section_seen.find(tsid);
-    if (it == _sdto_section_seen.end())
-        return false;
-    return (bool) ((*it)[section>>3] & bit_sel[section & 0x7]);
+    return _sdt_status.HasAllSections(tsid);
 }
 
 bool DVBStreamData::HasAllSDToSections(uint tsid) const
 {
-    sections_map_t::const_iterator it = _sdto_section_seen.find(tsid);
-    if (it == _sdto_section_seen.end())
-        return false;
-    for (uint i = 0; i < 32; i++)
-        if ((*it)[i] != 0xff)
-            return false;
-    return true;
-}
-
-void DVBStreamData::SetBATSectionSeen(uint bid, uint section)
-{
-    sections_map_t::iterator it = _bat_section_seen.find(bid);
-    if (it == _bat_section_seen.end())
-    {
-        _bat_section_seen[bid].resize(32, 0);
-        it = _bat_section_seen.find(bid);
-    }
-    (*it)[section>>3] |= bit_sel[section & 0x7];
-}
-
-bool DVBStreamData::BATSectionSeen(uint bid, uint section) const
-{
-    sections_map_t::const_iterator it = _bat_section_seen.find(bid);
-    if (it == _bat_section_seen.end())
-        return false;
-    return (bool) ((*it)[section>>3] & bit_sel[section & 0x7]);
+    return _sdto_status.HasAllSections(tsid);
 }
 
 bool DVBStreamData::HasAllBATSections(uint bid) const
 {
-    sections_map_t::const_iterator it = _bat_section_seen.find(bid);
-    if (it == _bat_section_seen.end())
-        return false;
-    for (uint i = 0; i < 32; i++)
-        if ((*it)[i] != 0xff)
-            return false;
-    return true;
-}
-
-void DVBStreamData::SetEITSectionSeen(uint tableid, uint serviceid,
-                                      uint section)
-{
-    uint key = (tableid<<16) | serviceid;
-    sections_map_t::iterator it = _eit_section_seen.find(key);
-    if (it == _eit_section_seen.end())
-    {
-        _eit_section_seen[key].resize(32, 0);
-        it = _eit_section_seen.find(key);
-    }
-    (*it)[section>>3] |= bit_sel[section & 0x7];
-}
-
-bool DVBStreamData::EITSectionSeen(uint tableid, uint serviceid,
-                                   uint section) const
-{
-    uint key = (tableid<<16) | serviceid;
-    sections_map_t::const_iterator it = _eit_section_seen.find(key);
-    if (it == _eit_section_seen.end())
-        return false;
-    return (bool) ((*it)[section>>3] & bit_sel[section & 0x7]);
-}
-
-void DVBStreamData::SetCITSectionSeen(uint contentid, uint section)
-{
-    sections_map_t::iterator it = _cit_section_seen.find(contentid);
-    if (it == _cit_section_seen.end())
-    {
-        _cit_section_seen[contentid].resize(32, 0);
-        it = _cit_section_seen.find(contentid);
-    }
-    (*it)[section>>3] |= bit_sel[section & 0x7];
-}
-
-bool DVBStreamData::CITSectionSeen(uint contentid, uint section) const
-{
-    sections_map_t::const_iterator it = _cit_section_seen.find(contentid);
-    if (it == _cit_section_seen.end())
-        return false;
-    return (bool) ((*it)[section>>3] & bit_sel[section & 0x7]);
+    return _bat_status.HasAllSections(bid);
 }
 
 bool DVBStreamData::HasCachedAnyNIT(bool current) const

mythtv/libs/libmythtv/mpeg/dvbstreamdata.h

@@ -5 +5 @@
 
 #include "mpegstreamdata.h"
 #include "mythtvexp.h"
+#include "TableStatus.h"
 
 typedef NetworkInformationTable* nit_ptr_t;
 typedef NetworkInformationTable const* nit_const_ptr_t;
@@ -53 +54 @@
                           uint_vec_t &del_pids) const;
 
     // Table versions
-    void SetVersionNIT(int version, uint last_section)
-    {
-        if (_nit_version == version)
-            return;
-        _nit_version = version;
-        init_sections(_nit_section_seen, last_section);
-    }
-    int  VersionNIT() const { return _nit_version; }
-
-    void SetVersionNITo(int version, uint last_section)
-    {
-        if (_nito_version == version)
-            return;
-        _nito_version = version;
-        init_sections(_nito_section_seen, last_section);
-    }
-    int  VersionNITo() const { return _nito_version; }
-
     void SetVersionSDT(uint tsid, int version, uint last_section)
     {
-        if (VersionSDT(tsid) == version)
-            return;
-        _sdt_versions[tsid] = version;
-        init_sections(_sdt_section_seen[tsid], last_section);
+        _sdt_status.SetVersion(tsid, version, last_section);
     }
-    int VersionSDT(uint tsid) const
-    {
-        const QMap<uint, int>::const_iterator it = _sdt_versions.find(tsid);
-        if (it == _sdt_versions.end())
-            return -1;
-        return *it;
-    }
-
-    void SetVersionSDTo(uint tsid, int version, uint last_section)
-    {
-        if (_sdto_versions[tsid] == version)
-            return;
-        _sdto_versions[tsid] = version;
-        init_sections(_sdto_section_seen[tsid], last_section);
-    }
-    int VersionSDTo(uint tsid) const
-    {
-        const QMap<uint, int>::const_iterator it = _sdto_versions.find(tsid);
-        if (it == _sdto_versions.end())
-            return -1;
-        return *it;
-    }
-
-    void SetVersionEIT(uint tableid, uint serviceid, int version, uint last_section)
-    {
-        if (VersionEIT(tableid, serviceid) == version)
-            return;
-        uint key = (tableid << 16) | serviceid;
-        _eit_version[key] = version;
-        init_sections(_eit_section_seen[key], last_section);
-    }
-
-    int VersionEIT(uint tableid, uint serviceid) const
-    {
-        uint key = (tableid << 16) | serviceid;
-        const QMap<uint, int>::const_iterator it = _eit_version.find(key);
-        if (it == _eit_version.end())
-            return -1;
-        return *it;
-    }
-
-    void SetVersionBAT(uint bid, int version, uint last_section)
-    {
-        if (_bat_versions[bid] == version)
-            return;
-        _bat_versions[bid] = version;
-        init_sections(_bat_section_seen[bid], last_section);
-    }
-    int VersionBAT(uint bid) const
-    {
-        const QMap<uint, int>::const_iterator it = _bat_versions.find(bid);
-        if (it == _bat_versions.end())
-            return -1;
-        return *it;
-    }
-
-    // Premiere private ContentInformationTable
-    void SetVersionCIT(uint contentid, int version)
-    {
-        if (VersionCIT(contentid) == version)
-            return;
-        _cit_version[contentid] = version;
-    }
-
-    int VersionCIT(uint contentid) const
-    {
-        const QMap<uint, int>::const_iterator it = _cit_version.find(contentid);
-        if (it == _cit_version.end())
-            return -1;
-        return *it;
-    }
-
     // Sections seen
-    void SetNITSectionSeen(uint section);
-    bool NITSectionSeen(uint section) const;
     bool HasAllNITSections(void) const;
 
-    void SetNIToSectionSeen(uint section);
-    bool NIToSectionSeen(uint section) const;
     bool HasAllNIToSections(void) const;
 
-    void SetSDTSectionSeen(uint tsid, uint section);
-    bool SDTSectionSeen(uint tsid, uint section) const;
     bool HasAllSDTSections(uint tsid) const;
 
-    void SetSDToSectionSeen(uint tsid, uint section);
-    bool SDToSectionSeen(uint tsid, uint section) const;
     bool HasAllSDToSections(uint tsid) const;
 
-    void SetEITSectionSeen(uint tableid, uint serviceid, uint section);
-    bool EITSectionSeen(uint tableid, uint serviceid, uint section) const;
-
-    void SetBATSectionSeen(uint bid, uint section);
-    bool BATSectionSeen(uint bid, uint section) const;
     bool HasAllBATSections(uint bid) const;
 
-    // Premiere private ContentInformationTable
-    void SetCITSectionSeen(uint contentid, uint section);
-    bool CITSectionSeen(uint contentid, uint section) const;
-
     // Caching
     bool HasCachedAnyNIT(bool current = true) const;
     bool HasCachedAllNIT(bool current = true) const;
@@ -226 +117 @@
     dvb_eit_listener_vec_t    _dvb_eit_listeners;
 
     // Table versions
-    int                       _nit_version;
-    QMap<uint, int>           _sdt_versions;
-    sections_t                _nit_section_seen;
-    sections_map_t            _sdt_section_seen;
-    QMap<uint, int>           _eit_version;
-    sections_map_t            _eit_section_seen;
+    TableStatus               _nit_status;
+    TableStatusMap            _sdt_status;
+    TableStatusMap            _eit_status;
     // Premiere private ContentInformationTable
-    QMap<uint, int>           _cit_version;
-    sections_map_t            _cit_section_seen;
-
-    int                       _nito_version;
-    QMap<uint, int>           _sdto_versions;
-    sections_t                _nito_section_seen;
-    sections_map_t            _sdto_section_seen;
-    QMap<uint, int>           _bat_versions;
-    sections_map_t            _bat_section_seen;
+    TableStatusMap            _cit_status;
+
+    TableStatus               _nito_status;
+    TableStatusMap            _sdto_status;
+    TableStatusMap            _bat_status;
 
     // Caching
     mutable nit_cache_t       _cached_nit;  // section -> sdt

mythtv/libs/libmythtv/mpeg/mpegstreamdata.cpp

@@ -21 +21 @@
 
 //#define DEBUG_MPEG_RADIO // uncomment to strip video streams from TS stream
 
-void init_sections(sections_t &sect, uint last_section)
-{
-    static const unsigned char init_bits[8] =
-        { 0xfe, 0xfc, 0xf8, 0xf0, 0xe0, 0xc0, 0x80, 0x00, };
-
-    sect.clear();
-
-    uint endz = last_section >> 3;
-    if (endz)
-        sect.resize(endz, 0x00);
-    sect.resize(32, 0xff);
-    sect[endz] = init_bits[last_section & 0x7];
-
-#if 0
-    {
-        QString msg = QString("init_sections ls(%1): ").arg(last_section);
-        for (uint i = 0 ; i < 32; i++)
-            msg += QString("%1 ").arg((int)sect[i], 0, 16);
-        LOG(VB_GENERAL, LOG_DEBUG, msg);
-    }
-#endif
-}
-
-const unsigned char MPEGStreamData::bit_sel[8] =
-{
-    0x1, 0x2, 0x4, 0x8, 0x10, 0x20, 0x40, 0x80,
-};
-
 /** \class MPEGStreamData
  *  \brief Encapsulates data about MPEG stream and emits events for each table.
  */
@@ -192 +164 @@
 
     _pid_video_single_program = _pid_pmt_single_program = 0xffffffff;
 
-    _pat_version.clear();
-    _pat_section_seen.clear();
+    _pat_status.clear();
 
-    _pmt_version.clear();
-    _pmt_section_seen.clear();
+    _pmt_status.clear();
 
     {
         QMutexLocker locker(&_cache_lock);
@@ -692 +662 @@
 
     if (TableID::PAT == table_id)
     {
-        if (VersionPAT(psip.TableIDExtension()) != version)
-            return false;
-        return PATSectionSeen(psip.TableIDExtension(), psip.Section());
+        return _pat_status.IsSectionSeen(psip.TableIDExtension(), version, psip.Section());
     }
 
     if (TableID::CAT == table_id)
     {
-        if (VersionCAT(psip.TableIDExtension()) != version)
-           return false;
-        return CATSectionSeen(psip.TableIDExtension(), psip.Section());
+        return _cat_status.IsSectionSeen(psip.TableIDExtension(), version, psip.Section());
     }
 
     if (TableID::PMT == table_id)
     {
-        if (VersionPMT(psip.TableIDExtension()) != version)
-            return false;
-        return PMTSectionSeen(psip.TableIDExtension(), psip.Section());
+        return _pmt_status.IsSectionSeen(psip.TableIDExtension(), version, psip.Section());
     }
 
     return false;
@@ -729 +693 @@
         case TableID::PAT:
         {
             uint tsid = psip.TableIDExtension();
-            SetVersionPAT(tsid, version, psip.LastSection());
-            SetPATSectionSeen(tsid, psip.Section());
+            _pat_status.SetSectionSeen(tsid, version, psip.Section(), psip.LastSection());
 
             ProgramAssociationTable pat(psip);
 
@@ -744 +707 @@
         case TableID::CAT:
         {
             uint tsid = psip.TableIDExtension();
-            SetVersionCAT(tsid, version, psip.LastSection());
-            SetCATSectionSeen(tsid, psip.Section());
+            _cat_status.SetSectionSeen(tsid, version, psip.Section(), psip.LastSection());
 
             ConditionalAccessTable cat(psip);
 
@@ -759 +721 @@
         case TableID::PMT:
         {
             uint prog_num = psip.TableIDExtension();
-            SetVersionPMT(prog_num, version, psip.LastSection());
-            SetPMTSectionSeen(prog_num, psip.Section());
+            _pmt_status.SetSectionSeen(prog_num, version, psip.Section(), psip.LastSection());
 
             ProgramMapTable pmt(psip);
 
@@ -1188 +1149 @@
     }
 }
 
-void MPEGStreamData::SetPATSectionSeen(uint tsid, uint section)
-{
-    sections_map_t::iterator it = _pat_section_seen.find(tsid);
-    if (it == _pat_section_seen.end())
-    {
-        _pat_section_seen[tsid].resize(32, 0);
-        it = _pat_section_seen.find(tsid);
-    }
-    (*it)[section>>3] |= bit_sel[section & 0x7];
-}
-
-bool MPEGStreamData::PATSectionSeen(uint tsid, uint section) const
-{
-    sections_map_t::const_iterator it = _pat_section_seen.find(tsid);
-    if (it == _pat_section_seen.end())
-        return false;
-    return (bool) ((*it)[section>>3] & bit_sel[section & 0x7]);
-}
-
 bool MPEGStreamData::HasAllPATSections(uint tsid) const
 {
-    sections_map_t::const_iterator it = _pat_section_seen.find(tsid);
-    if (it == _pat_section_seen.end())
-        return false;
-    for (uint i = 0; i < 32; i++)
-        if ((*it)[i] != 0xff)
-            return false;
-    return true;
-}
-
-void MPEGStreamData::SetCATSectionSeen(uint tsid, uint section)
-{
-    sections_map_t::iterator it = _cat_section_seen.find(tsid);
-    if (it == _cat_section_seen.end())
-    {
-        _cat_section_seen[tsid].resize(32, 0);
-        it = _cat_section_seen.find(tsid);
-    }
-    (*it)[section>>3] |= bit_sel[section & 0x7];
-}
-
-bool MPEGStreamData::CATSectionSeen(uint tsid, uint section) const
-{
-    sections_map_t::const_iterator it = _cat_section_seen.find(tsid);
-    if (it == _cat_section_seen.end())
-        return false;
-    return (bool) ((*it)[section>>3] & bit_sel[section & 0x7]);
+    return _pat_status.HasAllSections(tsid);
 }
 
 bool MPEGStreamData::HasAllCATSections(uint tsid) const
 {
-    sections_map_t::const_iterator it = _cat_section_seen.find(tsid);
-    if (it == _cat_section_seen.end())
-        return false;
-    for (uint i = 0; i < 32; i++)
-        if ((*it)[i] != 0xff)
-            return false;
-    return true;
-}
-
-void MPEGStreamData::SetPMTSectionSeen(uint prog_num, uint section)
-{
-    sections_map_t::iterator it = _pmt_section_seen.find(prog_num);
-    if (it == _pmt_section_seen.end())
-    {
-        _pmt_section_seen[prog_num].resize(32, 0);
-        it = _pmt_section_seen.find(prog_num);
-    }
-    (*it)[section>>3] |= bit_sel[section & 0x7];
-}
-
-bool MPEGStreamData::PMTSectionSeen(uint prog_num, uint section) const
-{
-    sections_map_t::const_iterator it = _pmt_section_seen.find(prog_num);
-    if (it == _pmt_section_seen.end())
-        return false;
-    return (bool) ((*it)[section>>3] & bit_sel[section & 0x7]);
+    return _cat_status.HasAllSections(tsid);
 }
 
 bool MPEGStreamData::HasAllPMTSections(uint prog_num) const
 {
-    sections_map_t::const_iterator it = _pmt_section_seen.find(prog_num);
-    if (it == _pmt_section_seen.end())
-        return false;
-    for (uint i = 0; i < 32; i++)
-        if ((*it)[i] != 0xff)
-            return false;
-    return true;
+    return _pmt_status.HasAllSections(prog_num);
 }
 
 bool MPEGStreamData::HasProgram(uint progNum) const

mythtv/libs/libmythtv/mpeg/mpegstreamdata.h

@@ -18 +18 @@
 #include "streamlisteners.h"
 #include "eitscanner.h"
 #include "mythtvexp.h"
+#include "TableStatus.h"
 
 class EITHelper;
 class PSIPTable;
@@ -47 +48 @@
 typedef QMap<uint, ProgramMapTable*>    pmt_cache_t;
 
 typedef vector<unsigned char>           uchar_vec_t;
-typedef uchar_vec_t                     sections_t;
-typedef QMap<uint, sections_t>          sections_map_t;
 
 typedef vector<MPEGStreamListener*>     mpeg_listener_vec_t;
 typedef vector<TSPacketListener*>       ts_listener_vec_t;
@@ -80 +79 @@
     uint decrypted_min;
 };
 
-void init_sections(sections_t &sect, uint last_section);
-
 typedef enum
 {
     kPIDPriorityNone   = 0,
@@ -166 +163 @@
     // Table versions
     void SetVersionPAT(uint tsid, int version, uint last_section)
     {
-        if (VersionPAT(tsid) == version)
-            return;
-        _pat_version[tsid] = version;
-        init_sections(_pat_section_seen[tsid], last_section);
-    }
-    int  VersionPAT(uint tsid) const
-    {
-        const QMap<uint, int>::const_iterator it = _pat_version.find(tsid);
-        if (it == _pat_version.end())
-            return -1;
-        return *it;
-    }
-
-    void SetVersionCAT(uint tsid, int version, uint last_section)
-    {
-        if (VersionCAT(tsid) == version)
-            return;
-        _cat_version[tsid] = version;
-        init_sections(_cat_section_seen[tsid], last_section);
-    }
-    int  VersionCAT(uint tsid) const
-    {
-        const QMap<uint, int>::const_iterator it = _cat_version.find(tsid);
-        if (it == _cat_version.end())
-            return -1;
-        return *it;
-    }
-
-    void SetVersionPMT(uint program_num, int version, uint last_section)
-    {
-        if (VersionPMT(program_num) == version)
-            return;
-        _pmt_version[program_num] = version;
-        init_sections(_pmt_section_seen[program_num], last_section);
-    }
-    int  VersionPMT(uint prog_num) const
-    {
-        const QMap<uint, int>::const_iterator it = _pmt_version.find(prog_num);
-        if (it == _pmt_version.end())
-            return -1;
-        return *it;
+        _pat_status.SetVersion(tsid, version, last_section);
     }
 
     // Sections seen
-    void SetPATSectionSeen(uint tsid, uint section);
-    bool PATSectionSeen(   uint tsid, uint section) const;
     bool HasAllPATSections(uint tsid) const;
 
-    void SetCATSectionSeen(uint tsid, uint section);
-    bool CATSectionSeen(   uint tsid, uint section) const;
     bool HasAllCATSections(uint tsid) const;
 
-    void SetPMTSectionSeen(uint prog_num, uint section);
-    bool PMTSectionSeen(   uint prog_num, uint section) const;
     bool HasAllPMTSections(uint prog_num) const;
 
     // Caching
@@ -388 +339 @@
     ts_av_listener_vec_t      _ts_av_listeners;
 
     // Table versions
-    QMap<uint, int>           _pat_version;
-    QMap<uint, int>           _cat_version;
-    QMap<uint, int>           _pmt_version;
-
-    sections_map_t            _pat_section_seen;
-    sections_map_t            _cat_section_seen;
-    sections_map_t            _pmt_section_seen;
+    TableStatusMap            _pat_status;
+    TableStatusMap            _cat_status;
+    TableStatusMap            _pmt_status;
 
     // PSIP construction
     pid_psip_map_t            _partial_psip_packet_cache;
@@ -425 +372 @@
     bool                      _invalid_pat_seen;
     bool                      _invalid_pat_warning;
     MythTimer                 _invalid_pat_timer;
-
-  protected:
-    static const unsigned char bit_sel[8];
 };
 
 #include "mpegtables.h"