Ticket #743: find-correct-pat-in-400ms-v3.diff

libs/libmythtv/mpeg/mpegstreamdata.cpp

@@ -24 +24 @@
       _cached_pat(NULL), _desired_program(desiredProgram),
       _pmt_single_program_num_video(1),
       _pmt_single_program_num_audio(0),
-      _pat_single_program(NULL), _pmt_single_program(NULL)
+      _pat_single_program(NULL), _pmt_single_program(NULL),
+      _invalid_pat_seen(false)
 {
     AddListeningPID(MPEG_PAT_PID);
 
@@ -46 +47 @@
 void MPEGStreamData::Reset(int desiredProgram)
 {
     _desired_program = desiredProgram;
+    _invalid_pat_seen = false;
 
     SetPATSingleProgram(0);
     SetPMTSingleProgram(0);
@@ -406 +408 @@
 
 void MPEGStreamData::ProcessPAT(const ProgramAssociationTable *pat)
 {
-    emit UpdatePAT(pat);
-    if ((_desired_program >= 0) && CreatePATSingleProgram(*pat))
-        emit UpdatePATSingleProgram(PATSingleProgram());
+    bool foundProgram = pat->FindPID(_desired_program);
+
+    if (_desired_program < 0)
+        emit UpdatePAT(pat);
+    if (_desired_program >= 0)
+    {
+        if (!_invalid_pat_seen && !foundProgram)
+        {
+            _invalid_pat_seen = true;
+            _invalid_pat_timer.start();
+            VERBOSE(VB_IMPORTANT, "ProcesPAT -> PAT is missing program, setting timeout");
+        }
+        else if (_invalid_pat_seen && (_invalid_pat_timer.elapsed() > 400))
+        {
+            // After 400ms emit error if we haven't found correct PAT.
+            VERBOSE(VB_IMPORTANT, "Program not found in PAT. Rescan your transports.");
+            // This will trigger debug PAT print
+            emit UpdatePAT(pat);
+            if (CreatePATSingleProgram(*pat))
+                emit UpdatePATSingleProgram(PATSingleProgram());
+            _invalid_pat_seen = false;
+        }
+        else if (foundProgram)
+        {
+            if (_invalid_pat_seen)
+            {
+                _invalid_pat_seen = false;
+                VERBOSE(VB_IMPORTANT, "ProcesPAT -> PAT updated");
+            }
+            emit UpdatePAT(pat);
+            if (CreatePATSingleProgram(*pat))
+                emit UpdatePATSingleProgram(PATSingleProgram());
+        }
+    }
 }
 
 void MPEGStreamData::ProcessPMT(const uint pid, const ProgramMapTable *pmt)

libs/libmythtv/mpeg/mpegstreamdata.h

@@ -8 +8 @@
 
 #include <qmap.h>
 #include "tspacket.h"
+#include "util.h"
 
 class ProgramAssociationTable;
 class ProgramMapTable;
@@ -179 +180 @@
     uint                      _pmt_single_program_num_audio;
     ProgramAssociationTable  *_pat_single_program;
     ProgramMapTable          *_pmt_single_program;
+
+  // PAT Timeout handling.
+  private:
+    bool                     _invalid_pat_seen;
+    MythTimer                _invalid_pat_timer;
 };
 
 #include "mpegtables.h"