Ticket #1907: sr.diff

mythtv/libs/libmythtv/dvbsignalmonitor.cpp

@@ -420 +420 @@
             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));
-            }
+            // Pass buffer in tspacket chunks to let AssemblePSIP reuild it
+            uint pos = 0;
+            buffer[3] = 0x10;   // reset continuity ctr to 0
+            while ( pos+188 <= pktEnd )
+            {
+                remainder = GetStreamData()->ProcessData(&buffer[pos],188);
+                if ( remainder > 0 )
+                {
+                    VERBOSE(VB_CHANNEL, LOC + "RunTableMonitorSR(): " +
+                        QString("unhandled data (# bytes: %1) pid %2 length %3")
+                        .arg(remainder).arg(fit.key()).arg(len));
+                    break;
+                } 
+                pos += 188-header_size;
+                buffer[3] = 0x10 | ((1+buffer[3])&0xf);  // bump continuity ctr
+                memcpy(&buffer[pos], &buffer[0],5); // copy ts header upto data 
+            }
+
         }
         if (!readSomething)
         {