Ticket #743: find-correct-pat-in-400ms-v2.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);
 
     _pid_video_single_program = _pid_pmt_single_program = 0xffffffff;
+
+    connect(&_invalid_pat_timer, SIGNAL(timeout()), this, SLOT(ProcessInvalidPAT()));
 }
 
 MPEGStreamData::~MPEGStreamData()
@@ -46 +49 @@
 void MPEGStreamData::Reset(int desiredProgram)
 {
     _desired_program = desiredProgram;
+    _invalid_pat_seen = false;
 
     SetPATSingleProgram(0);
     SetPMTSingleProgram(0);
@@ -406 +410 @@
 
 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(400, TRUE); // 400ms timeout.
+            VERBOSE(VB_IMPORTANT, "HandleTables -> PAT is missing program, setting timeout");
+        }
+        else if (foundProgram)
+        {
+            if (_invalid_pat_seen)
+            {
+                _invalid_pat_seen = false;
+                _invalid_pat_timer.stop();
+                VERBOSE(VB_IMPORTANT, "HandleTables -> PAT updated");
+            }
+            emit UpdatePAT(pat);
+            if (CreatePATSingleProgram(*pat))
+                emit UpdatePATSingleProgram(PATSingleProgram());
+        }
+    }
 }
 
 void MPEGStreamData::ProcessPMT(const uint pid, const ProgramMapTable *pmt)
@@ -421 +447 @@
     }
 }
 
+void MPEGStreamData::ProcessInvalidPAT(void)
+{
+    VERBOSE(VB_IMPORTANT, "Program not found in PAT. Rescan your transports.");
+}
+
 #define DONE_WITH_PES_PACKET() { if (psip) delete psip; \
     if (morePSIPPackets) goto HAS_ANOTHER_PES; else return; }
 

libs/libmythtv/mpeg/mpegstreamdata.h

@@ -7 +7 @@
 using namespace std;
 
 #include <qmap.h>
+#include <qtimer.h>
 #include "tspacket.h"
 
 class ProgramAssociationTable;
@@ -179 +180 @@
     uint                      _pmt_single_program_num_audio;
     ProgramAssociationTable  *_pat_single_program;
     ProgramMapTable          *_pmt_single_program;
+
+  // PAT Timeout handling.
+  protected slots:
+    void                     ProcessInvalidPAT();
+  private:
+    bool                     _invalid_pat_seen;
+    QTimer                   _invalid_pat_timer;
 };
 
 #include "mpegtables.h"