Ticket #1907: sr2.diff

mythtv/libs/libmythtv/mpeg/mpegstreamdata.cpp

@@ -655 +655 @@
 }
 #undef DONE_WITH_PES_PACKET
 
+/** \fn MPEGStreamData::HandlePESTables(const TSPacket*, const unsigned char* , const int)
+ *  \brief handles complete SI table passed as buffer
+ */
+void MPEGStreamData::HandlePESTables(const TSPacket* tspkt, const unsigned char* buffer, const int len)
+{
+    PSIPTable *psip =  new PSIPTable(*tspkt, buffer, len);
+    if (!psip)
+       return;
+
+    // Validate PSIP
+    // but don't validate PMT/PAT if our driver has the PMT/PAT CRC bug.
+    bool buggy = _have_CRC_bug &&
+        ((TableID::PMT == psip->TableID()) ||
+         (TableID::PAT == psip->TableID()));
+    if (!buggy && !psip->IsGood())
+    {
+        VERBOSE(VB_RECORD, QString("HandlePESTable packet failed CRC check. "
+                                   "pid(0x%1) type(0x%2)")
+                .arg(tspkt->PID(),0,16).arg(psip->TableID(),0,16));
+        delete psip;
+        return;
+    }
+
+    if (!psip->IsCurrent()) // we don't cache the next table, for now
+    {
+        delete psip;
+        return;
+    }
+
+    // Don't decode redundant packets,
+    // but if it is a desired PAT or PMT emit a "heartbeat" signal.
+    if (IsRedundant(tspkt->PID(), *psip))
+    {
+        if (TableID::PAT == psip->TableID())
+        {
+            QMutexLocker locker(&_listener_lock);
+            ProgramAssociationTable *pat_sp = PATSingleProgram();
+            for (uint i = 0; i < _mpeg_sp_listeners.size(); i++)
+                _mpeg_sp_listeners[i]->HandleSingleProgramPAT(pat_sp);
+        }
+        if (TableID::PMT == psip->TableID() &&
+            tspkt->PID() == _pid_pmt_single_program)
+        {
+            QMutexLocker locker(&_listener_lock);
+            ProgramMapTable *pmt_sp = PMTSingleProgram();
+            for (uint i = 0; i < _mpeg_sp_listeners.size(); i++)
+                _mpeg_sp_listeners[i]->HandleSingleProgramPMT(pmt_sp);
+        }
+        delete psip;            // already parsed this table, toss it.
+        return;
+    }
+    HandleTables(tspkt->PID(), *psip);
+    if(psip) delete psip; 
+}
+
 int MPEGStreamData::ProcessData(unsigned char *buffer, int len)
 {
     int pos = 0;

mythtv/libs/libmythtv/mpeg/mpegtables.h

@@ -282 +282 @@
         // section_syntax_ind   1       1.0       8   should always be 1
         // private_indicator    1       1.1       9   should always be 1
     }
+    PSIPTable(const TSPacket &tspacket,
+              const unsigned char *pesdata, uint pes_size) 
+             : PESPacket( tspacket, pesdata, pes_size )
+    { 
+    }
 
 
     static const PSIPTable View(const TSPacket& tspacket)

mythtv/libs/libmythtv/mpeg/mpegstreamdata.h

@@ -62 +62 @@
     virtual bool IsRedundant(uint pid, const PSIPTable&) const;
     virtual bool HandleTables(uint pid, const PSIPTable &psip);
     virtual void HandleTSTables(const TSPacket* tspacket);
+    virtual void HandlePESTables(const TSPacket* tspacket,
+                                 const unsigned char* buffer, const int len);
     virtual bool ProcessTSPacket(const TSPacket& tspacket);
     virtual int  ProcessData(unsigned char *buffer, int len);
     inline  void HandleAdaptationFieldControl(const TSPacket* tspacket);

mythtv/libs/libmythtv/mpeg/pespacket.h

@@ -114 +114 @@
         _fullbuffer = pes_alloc(_allocSize);
         _pesdata    = _fullbuffer + _psiOffset + 1;
         memcpy(_fullbuffer, tspacket.data(), 188);
-        memcpy(_pesdata, pesdata, pes_size-1);
+        memcpy(_pesdata, pesdata, pes_size);
+        _badPacket = !VerifyCRC();
     }
 
     virtual ~PESPacket()

mythtv/libs/libmythtv/dvbsignalmonitor.cpp

@@ -380 +380 @@
  */
 void DVBSignalMonitor::RunTableMonitorSR(void)
 {
-    int remainder   = 0;
+    TSPacket *tspkt = new TSPacket(); // Header only is not possible
+    if (!tspkt) return;
+
     int buffer_size = 4192;  // maximum size of Section we handle
-    int header_size = 5;     // TSPacket::HEADER_SIZE + 1 for data pointer
-    unsigned char *buffer = new unsigned char[header_size + buffer_size];
+    unsigned char *buffer = new unsigned char[buffer_size];
     if (!buffer)
+    {
+        delete tspkt;
         return;
+    }
 
-    // "Constant" parts of stream header
-    buffer[0] = SYNC_BYTE;
-    buffer[3] = 0x10;   // Adaptation = 01 Scrambled = 00
-    buffer[4] = 0x00;   // Pointer to data in buffer
+    tspkt->SetPayloadStart(true);
+    tspkt->SetScrambled(0);
+    tspkt->SetAdaptationFieldControl(0x01);
+    tspkt->SetContinuityCounter(0);
+    tspkt->SetStartOfFieldPointer(0);
 
     VERBOSE(VB_CHANNEL, LOC + "RunTableMonitorSR(): " +
             QString("begin (# of pids %1)")
@@ -406 +411 @@
         for (; fit != filters.end(); ++fit)
         {
             int mux_fd = fit.data();
-            len = read(mux_fd, &(buffer[header_size]),
-                       buffer_size - header_size);
-
+            len = read(mux_fd, &buffer[0], buffer_size);
             if (len <= 0)
                 continue;
 
             readSomething = true;
-            // set pid and section start flag
-            // then pad buffer to next 188 byte boundary
-            buffer[1] = ( fit.key() >> 8 ) | 0x40;
-            buffer[2] = ( fit.key() & 0xff );
-            int pktEnd = ((len + 188 + header_size) / 188) * 188 ; 
-            memset(&buffer[header_size + len], 0xFF, pktEnd - len);
-
-            remainder = GetStreamData()->ProcessData(buffer, pktEnd);
-            if (remainder > 0)
-            {
-                // only happens on fragmented packet reads
-                VERBOSE(VB_CHANNEL, LOC + "RunTableMonitorSR(): " +
-                        QString("unhandled data (# bytes: %1)")
-                        .arg(remainder));
-            }
+            tspkt->SetPID(fit.key());
+            GetStreamData()->HandlePESTables(tspkt, buffer, len);
         }
         if (!readSomething)
         {
@@ -449 +439 @@
     }
 
     delete[] buffer;
+    delete tspkt;
 
     VERBOSE(VB_CHANNEL, LOC + "RunTableMonitorSR(): " + "end");
 }