Ticket #1619: foundProgram.diff

mythtv/libs/libmythtv/mpeg/mpegstreamdata.cpp

@@ -57 +57 @@
 {
     SetVersionPAT(-1,0);
     AddListeningPID(MPEG_PAT_PID);
+
+    _found_program = false;
 }
 
 MPEGStreamData::~MPEGStreamData()
@@ -386 +388 @@
  */
 bool MPEGStreamData::IsRedundant(uint pid, const PSIPTable &psip) const
 {
+    // If we haven't found the PAT or PMT we're looking for
+    // we should always reread the tables in case we can't
+    // rely on the table's version number.
+    if (!_found_program)
+        return false;
+
     (void) pid;
     const int table_id = psip.TableID();
     const int version  = psip.Version();
@@ -462 +470 @@
 
 void MPEGStreamData::ProcessPAT(const ProgramAssociationTable *pat)
 {
-    bool foundProgram = pat->FindPID(_desired_program);
+    _found_program = pat->FindPID(_desired_program);
 
     if (_desired_program < 0)
     {
@@ -470 +478 @@
         return;
     }
 
-    if (!_invalid_pat_seen && !foundProgram)
+    if (!_invalid_pat_seen && !_found_program)
     {
         _invalid_pat_seen = true;
         _invalid_pat_warning = false;
@@ -478 +486 @@
         VERBOSE(VB_RECORD, "ProcessPAT: "
                 "PAT is missing program, setting timeout");
     }
-    else if (_invalid_pat_seen && !foundProgram &&
+    else if (_invalid_pat_seen && !_found_program &&
              (_invalid_pat_timer.elapsed() > 400) && !_invalid_pat_warning)
     {
         _invalid_pat_warning = true; // only emit one warning...
@@ -491 +499 @@
         if (CreatePATSingleProgram(*pat))
             emit UpdatePATSingleProgram(PATSingleProgram());
     }
-    else if (foundProgram)
+    else if (_found_program)
     {
         if (_invalid_pat_seen)
             VERBOSE(VB_RECORD, "ProcessPAT: Good PAT seen after a bad PAT");

mythtv/libs/libmythtv/mpeg/mpegstreamdata.h

@@ -227 +227 @@
 
   // PAT Timeout handling.
   private:
+    bool                      _found_program;
     bool                      _invalid_pat_seen;
     bool                      _invalid_pat_warning;
     MythTimer                 _invalid_pat_timer;