don't force SI sections into a PESPacket, use the new constructor ins…

…tead A variant of this has been lightly tested and I'd like to get it into 0.27 as it should fix all kinds of issues down the line. E.g. stuff related to the SI for DVB-CAM being rejected due to expecting a CRC which they don't have It also removes the false positive CRC errors from the logs. Fixes #10495 Fixes #10496
MythTV · Jul 18, 2013 · 20291e6 · 20291e6
1 parent 08e471c
commit 20291e6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 19 deletions.
diff --git a/mythtv/libs/libmythtv/avformatdecoder.cpp b/mythtv/libs/libmythtv/avformatdecoder.cpp
@@ -1557,9 +1557,7 @@ void AvFormatDecoder::ScanATSCCaptionStreams(int av_index)
         return;
     }
 
-    const PESPacket pes = PESPacket::ViewData(ic->cur_pmt_sect);
-    const PSIPTable psip(pes);
-    const ProgramMapTable pmt(psip);
+    const ProgramMapTable pmt(ic->cur_pmt_sect);
 
     uint i;
     for (i = 0; i < pmt.StreamCount(); i++)
@@ -1684,9 +1682,7 @@ void AvFormatDecoder::ScanTeletextCaptions(int av_index)
     if (!ic->cur_pmt_sect || tracks[kTrackTypeTeletextCaptions].size())
         return;
 
-    const PESPacket pes = PESPacket::ViewData(ic->cur_pmt_sect);
-    const PSIPTable psip(pes);
-    const ProgramMapTable pmt(psip);
+    const ProgramMapTable pmt(ic->cur_pmt_sect);
 
     for (uint i = 0; i < pmt.StreamCount(); i++)
     {
@@ -1761,9 +1757,7 @@ void AvFormatDecoder::ScanDSMCCStreams(void)
     if (!itv && ! (itv = m_parent->GetInteractiveTV()))
         return;
 
-    const PESPacket pes = PESPacket::ViewData(ic->cur_pmt_sect);
-    const PSIPTable psip(pes);
-    const ProgramMapTable pmt(psip);
+    const ProgramMapTable pmt(ic->cur_pmt_sect);
 
     for (uint i = 0; i < pmt.StreamCount(); i++)
     {
@@ -2461,9 +2455,7 @@ AudioTrackType AvFormatDecoder::GetAudioTrackType(uint stream_index)
 
     if (ic->cur_pmt_sect) // mpeg-ts
     {
-        const PESPacket pes = PESPacket::ViewData(ic->cur_pmt_sect);
-        const PSIPTable psip(pes);
-        const ProgramMapTable pmt(psip);
+        const ProgramMapTable pmt(ic->cur_pmt_sect);
         switch (pmt.GetAudioType(stream_index))
         {
             case 0x01 :
@@ -4853,9 +4845,7 @@ bool AvFormatDecoder::HasVideo(const AVFormatContext *ic)
 {
     if (ic && ic->cur_pmt_sect)
     {
-        const PESPacket pes = PESPacket::ViewData(ic->cur_pmt_sect);
-        const PSIPTable psip(pes);
-        const ProgramMapTable pmt(psip);
+        const ProgramMapTable pmt(ic->cur_pmt_sect);
 
         for (uint i = 0; i < pmt.StreamCount(); i++)
         {

diff --git a/mythtv/libs/libmythtv/mpeg/mpegtables.h b/mythtv/libs/libmythtv/mpeg/mpegtables.h
@@ -371,8 +371,9 @@ class MTV_PUBLIC PSIPTable : public PESPacket
     PSIPTable(const PESPacket& pkt, bool)
         : PESPacket(reinterpret_cast<const TSPacket*>(pkt.tsheader()), false)
         { ; }
+  public:
     /// Constructor for viewing a section, does not create it's own data
-    PSIPTable(const unsigned char *pesdata, bool)
+    PSIPTable(const unsigned char *pesdata)
         : PESPacket(pesdata, false)
     {
         // fixup wrong assumption about length for sections without CRC
@@ -403,7 +404,7 @@ class MTV_PUBLIC PSIPTable : public PESPacket
         { return PSIPTable(PESPacket::View(tspacket), false); }
 
     static const PSIPTable ViewData(const unsigned char* pesdata)
-        { return PSIPTable(pesdata, false); }
+        { return PSIPTable(pesdata); }
 
     // Section            Bits   Start Byte sbit
     // -----------------------------------------

diff --git a/mythtv/libs/libmythtv/recorders/dvbstreamhandler.cpp b/mythtv/libs/libmythtv/recorders/dvbstreamhandler.cpp
@@ -331,8 +331,7 @@ void DVBStreamHandler::RunSR(void)
 
             readSomething = true;
 
-            const PESPacket pes = PESPacket::ViewData(buffer);
-            const PSIPTable psip(pes);
+            const PSIPTable psip(buffer);
 
             if (psip.SectionSyntaxIndicator())
             {