Ticket #2699: t2699_2.diff

libs/libmythtv/dtvsignalmonitor.cpp

@@ -44 +44 @@
       networkID(0), transportID(0),
       detectedNetworkID(0), detectedTransportID(0),
       programNumber(-1),
+      last_pat_crc(-1),
       error("")
 {
 }
@@ -185 +186 @@
 void DTVSignalMonitor::SetChannel(int major, int minor)
 {
     DBG_SM(QString("SetChannel(%1, %2)").arg(major).arg(minor), "");
+    last_pat_crc = -1;
     if (GetATSCStreamData() && (majorChannel != major || minorChannel != minor))
     {
         RemoveFlags(kDTVSigMon_PATSeen   | kDTVSigMon_PATMatch |
@@ -201 +203 @@
 void DTVSignalMonitor::SetProgramNumber(int progNum)
 {
     DBG_SM(QString("SetProgramNumber(%1)").arg(progNum), "");
+    last_pat_crc = -1;
     if (programNumber != progNum)
     {
         RemoveFlags(kDTVSigMon_PMTSeen   | kDTVSigMon_PMTMatch |
@@ -216 +219 @@
 {
     DBG_SM(QString("SetDVBService(transport_id: %1, network_id: %2, "
                    "service_id: %3)").arg(tsid).arg(netid).arg(serviceid), "");
+    last_pat_crc = -1;
 
     if (netid == networkID && tsid == transportID &&
         serviceid == programNumber)
@@ -280 +284 @@
     {
         AddFlags(kDTVSigMon_PATMatch);
         GetStreamData()->AddListeningPID(pmt_pid);
+        last_pat_crc = pat->CRC();
         return;
     }
 
@@ -293 +298 @@
         GetStreamData()->SetVersionPAT(tsid, -1,0);
         // END HACK HACK HACK
 
-        QString errStr = QString("Program #%1 not found in PAT!")
-            .arg(programNumber);
-        VERBOSE(VB_IMPORTANT, errStr<<endl<<pat->toString()<<endl);
+        if (last_pat_crc != pat->CRC())
+        {
+            last_pat_crc = pat->CRC();
+            QString errStr = QString("Program #%1 not found in PAT!")
+                .arg(programNumber);
+            VERBOSE(VB_IMPORTANT, errStr<<endl<<pat->toString());
+        }
         if (pat->ProgramCount() == 1)
         {
             VERBOSE(VB_IMPORTANT, "But there is only one program "
@@ -303 +312 @@
             SetProgramNumber(pat->ProgramNumber(0));
             AddFlags(kDTVSigMon_PATMatch);
             GetStreamData()->AddListeningPID(pat->ProgramPID(0));
+            last_pat_crc == pat->CRC();
         }
     }
 }

libs/libmythtv/dtvsignalmonitor.h

@@ -137 +137 @@
     uint               detectedTransportID;
     // MPEG/DVB/ATSC tuning info
     int                programNumber;
+    // CRC of the last seen PAT
+    int64_t           last_pat_crc;
 
     QString            error;
 };