No ATSC error messages for DVB-CA tables

Extend the filtering of ATSCStreamData error messages caused by unhandled DVB Conditional Access tables by adding a number of table IDs. All DVB-CA table IDs now added have been found in channel scans of the Astra-1 19.2E satellite. A more elegant solution is to parse CA descriptors, collect all CA pids and to ignore all tables found on the CA pids.
MythTV · Aug 8, 2020 · e015e7a · e015e7a
1 parent c611e16
commit e015e7a
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 2 deletions.
diff --git a/mythtv/libs/libmythtv/mpeg/atscstreamdata.cpp b/mythtv/libs/libmythtv/mpeg/atscstreamdata.cpp
@@ -460,8 +460,20 @@ bool ATSCStreamData::HandleTables(uint pid, const PSIPTable &psip)
         case TableID::BAT:
         case TableID::TDT:
         case TableID::TOT:
+        case TableID::DVBCA_81:
         case TableID::DVBCA_82:
         case TableID::DVBCA_83:
+        case TableID::DVBCA_84:
+        case TableID::DVBCA_85:
+        case TableID::DVBCA_86:
+        case TableID::DVBCA_87:
+        case TableID::DVBCA_88:
+        case TableID::DVBCA_89:
+        case TableID::DVBCA_8a:
+        case TableID::DVBCA_8b:
+        case TableID::DVBCA_8c:
+        case TableID::DVBCA_8d:
+        case TableID::DVBCA_8e:
         {
             // All DVB specific tables, not handled here
             return false;
@@ -470,8 +482,8 @@ bool ATSCStreamData::HandleTables(uint pid, const PSIPTable &psip)
         default:
         {
             LOG(VB_RECORD, LOG_ERR, LOC +
-                QString("ATSCStreamData::HandleTables(): Unknown table 0x%1")
-                    .arg(psip.TableID(),0,16));
+                QString("ATSCStreamData::HandleTables(): Unknown table 0x%1 version:%2 pid:%3 0x%4")
+                    .arg(psip.TableID(),0,16).arg(psip.Version()).arg(pid).arg(pid,0,16));
             break;
         }
     }

diff --git a/mythtv/libs/libmythtv/mpeg/mpegtables.h b/mythtv/libs/libmythtv/mpeg/mpegtables.h
@@ -283,8 +283,20 @@ class MTV_PUBLIC TableID
 
         // DVB Conditional Access
         DVBCAbeg = 0x80,
+        DVBCA_81 = 0x81,
         DVBCA_82 = 0x82,
         DVBCA_83 = 0x83,
+        DVBCA_84 = 0x84,
+        DVBCA_85 = 0x85,
+        DVBCA_86 = 0x86,
+        DVBCA_87 = 0x87,
+        DVBCA_88 = 0x88,
+        DVBCA_89 = 0x89,
+        DVBCA_8a = 0x8a,
+        DVBCA_8b = 0x8b,
+        DVBCA_8c = 0x8c,
+        DVBCA_8d = 0x8d,
+        DVBCA_8e = 0x8e,
         DVBCAend = 0x8f,
 
         // Dishnet Longterm EIT data