Ticket #10496: 0004-refactor-PESPacket-and-PSIPTable-some-more-to-silenc.patch

mythtv/libs/libmythtv/avformatdecoder.cpp

@@ -1468 +1468 @@
         return;
     }
 
-    const PESPacket pes = PESPacket::ViewData(ic->cur_pmt_sect);
-    const PSIPTable psip(pes);
-    const ProgramMapTable pmt(psip);
+    const ProgramMapTable pmt = ProgramMapTable::ViewData(ic->cur_pmt_sect);
 
     uint i;
     for (i = 0; i < pmt.StreamCount(); i++)
@@ -1595 +1593 @@
     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 = PSIPTable::ViewData(ic->cur_pmt_sect);
 
     for (uint i = 0; i < pmt.StreamCount(); i++)
     {
@@ -1669 +1665 @@
     if (!itv && ! (itv = m_parent->GetInteractiveTV()))
         return;
 
-    const PESPacket pes = PESPacket::ViewData(ic->cur_pmt_sect);
-    const PSIPTable psip(pes);
-    const ProgramMapTable pmt(psip);
+    ProgramMapTable pmt = ProgramMapTable::ViewData(ic->cur_pmt_sect);
 
     for (uint i = 0; i < pmt.StreamCount(); i++)
     {
@@ -4539 +4533 @@
 {
     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 = ProgramMapTable::ViewData(ic->cur_pmt_sect);
 
         for (uint i = 0; i < pmt.StreamCount(); i++)
         {

mythtv/libs/libmythtv/dvbstreamhandler.cpp

@@ -324 +324 @@
 
             readSomething = true;
 
-            const PESPacket pes = PESPacket::ViewData(buffer);
-            const PSIPTable psip(pes);
+            const PSIPTable psip = PSIPTable::ViewData(buffer);
 
             if (psip.SectionSyntaxIndicator())
             {

mythtv/libs/libmythtv/firewiredevice.cpp

@@ -16 +16 @@
 #include "darwinfirewiredevice.h"
 #endif
 #include "mythlogging.h"
-#include "pespacket.h"
+#include "mpegtables.h"
 
 #define LOC      QString("FireDev(%1): ").arg(guid_to_string(m_guid))
 
@@ -336 +336 @@
     if (!tspacket.TransportError() && !tspacket.Scrambled() &&
         tspacket.HasPayload() && tspacket.PayloadStart() && !tspacket.PID())
     {
-        PESPacket pes = PESPacket::View(tspacket);
+        PSIPTable pes = PSIPTable::View(tspacket);
         uint crc = pes.CalcCRC();
         m_buffer_cleared |= (crc != m_last_crc);
         m_last_crc = crc;

mythtv/libs/libmythtv/mpeg/mpegtables.h

@@ -350 +350 @@
 };
 
 /** \class PSIPTable
- *  \brief A PSIP table is a special type of PES packet containing an
- *         MPEG, ATSC, or DVB table.
+ *  \brief A PSIP table is a variant of a PES packet containing an
+ *         MPEG, ATSC or DVB table.
  */
 class MTV_PUBLIC PSIPTable : public PESPacket
 {
+    /// Only handles single TS packet PES packets, for PMT/PAT tables basically
+    void InitPESPacket(TSPacket& tspacket)
+    {
+        if (tspacket.PayloadStart())
+            _psiOffset = tspacket.AFCOffset() + tspacket.StartOfFieldPointer();
+        else
+        {
+            LOG(VB_GENERAL, LOG_ERR, "Started PESPacket, but !payloadStart()");
+            _psiOffset = tspacket.AFCOffset();
+        }
+        _pesdata = tspacket.data() + _psiOffset + 1;
+
+        _badPacket = true;
+        // first check if Length() will return something useful and
+        // than check if the packet ends in the first TSPacket
+        if ((_pesdata - tspacket.data()) <= (188-3) &&
+            (_pesdata + Length() - tspacket.data()) <= (188-3))
+        {
+            _badPacket = !VerifyCRC();
+        }
+    }
+
+  protected:
+    // does not create it's own data
+    PSIPTable(const TSPacket& tspacket, bool)
+        : PESPacket()
+    {
+        _pesdata = NULL;
+        _fullbuffer = NULL;
+         _ccLast = tspacket.ContinuityCounter();
+         _allocSize = 0;
+        InitPESPacket(const_cast<TSPacket&>(tspacket));
+        _fullbuffer = const_cast<unsigned char*>(tspacket.data());
+        _pesdataSize = TSPacket::kSize - (_pesdata - _fullbuffer);
+    }
+
+  public:
+
+    // may be modified
+    PSIPTable(const TSPacket &tspacket,
+              const unsigned char *pesdata, uint pes_size)
+        : PESPacket()
+    { // clone
+        _ccLast = tspacket.ContinuityCounter();
+        _pesdataSize = pes_size;
+        InitPESPacket(const_cast<TSPacket&>(tspacket)); // sets _psiOffset
+        int len     = pes_size+4;
+        /* make alloc size multiple of 188 */
+        _allocSize  = ((len+_psiOffset+187)/188)*188;
+        _fullbuffer = pes_alloc(_allocSize);
+        _pesdata    = _fullbuffer + _psiOffset + 1;
+        memcpy(_fullbuffer, tspacket.data(), 188);
+        memcpy(_pesdata, pesdata, pes_size-1);
+    }
+
+
   private:
     // creates non-clone version, for View
     PSIPTable(const PESPacket& pkt, bool)
-        : PESPacket(reinterpret_cast<const TSPacket*>(pkt.tsheader()), false)
-        { ; }
+    {
+        PSIPTable(reinterpret_cast<const PESPacket&>(*pkt.data()), false);
+    }
   public:
     PSIPTable(const PSIPTable& table) : PESPacket(table)
     {
@@ -371 +428 @@
         // section_syntax_ind   1       1.0       8   should always be 1
         // private_indicator    1       1.1       9   should always be 1
     }
-    PSIPTable(const TSPacket& table) : PESPacket(table)
+    // may be modified
+    PSIPTable(const TSPacket& table)
+        : PESPacket()
     {
         // section_syntax_ind   1       1.0       8   should always be 1
         // private_indicator    1       1.1       9   should always be 1
+
+        _ccLast = table.ContinuityCounter();
+        _pesdataSize = 188;
+
+        // clone
+        InitPESPacket(const_cast<TSPacket&>(table)); // sets _psiOffset
+
+        int len     = (4*1024) - 256; /* ~4KB */
+        _allocSize  = len + _psiOffset;
+        _fullbuffer = pes_alloc(_allocSize);
+        _pesdata    = _fullbuffer + _psiOffset + 1;
+        memcpy(_fullbuffer, table.data(), TSPacket::kSize);
     }
 
 
     static const PSIPTable View(const TSPacket& tspacket)
-        { return PSIPTable(PESPacket::View(tspacket), false); }
+        { return PSIPTable(tspacket, false); }
 
     static PSIPTable View(TSPacket& tspacket)
-        { return PSIPTable(PESPacket::View(tspacket), false); }
+        { return PSIPTable(tspacket, false); }
+
+    static const PSIPTable ViewData(const unsigned char* pesdata)
+        { return PSIPTable(reinterpret_cast<const TSPacket&>(*pesdata), false); }
 
     // Section            Bits   Start Byte sbit
     // -----------------------------------------

mythtv/libs/libmythtv/mpeg/pespacket.h

@@ -19 +19 @@
 
 /** \class PESPacket
  *  \brief Allows us to transform TS packets to PES packets, which
- *         are used to hold PSIP tables as well as multimedia streams.
+ *         are used to hold multimedia streams and very similar to PSIP tables.
  *  \sa PSIPTable, TSPacket
  */
 class PESPacket
 {
-    /// Only handles single TS packet PES packets, for PMT/PAT tables basically
-    void InitPESPacket(TSPacket& tspacket)
-    {
-        if (tspacket.PayloadStart())
-            _psiOffset = tspacket.AFCOffset() + tspacket.StartOfFieldPointer();
-        else
-        {
-            LOG(VB_GENERAL, LOG_ERR, "Started PESPacket, but !payloadStart()");
-            _psiOffset = tspacket.AFCOffset();
-        }
-        _pesdata = tspacket.data() + _psiOffset + 1;
-
-        _badPacket = true;
-        // first check if Length() will return something useful and
-        // than check if the packet ends in the first TSPacket
-        if ((_pesdata - tspacket.data()) <= (188-3) &&
-            (_pesdata + Length() - tspacket.data()) <= (188-3))
-        {
-            _badPacket = !VerifyCRC();
-        }
-    }
-
   protected:
-    // does not create it's own data
-    PESPacket(const TSPacket* tspacket, bool)
-        : _pesdata(NULL),    _fullbuffer(NULL),
-          _ccLast(tspacket->ContinuityCounter()), _allocSize(0)
-    {
-        InitPESPacket(const_cast<TSPacket&>(*tspacket));
-        _fullbuffer = const_cast<unsigned char*>(tspacket->data());
-        _pesdataSize = TSPacket::kSize - (_pesdata - _fullbuffer);
-    }
+    /** noop constructor, only for use by derived classes */
+    PESPacket()
+    { ; }
+
     // does not create it's own data
     PESPacket(const unsigned char *pesdata, bool)
         : _pesdata(const_cast<unsigned char*>(pesdata)),
@@ -88 +61 @@
         _pesdata = _fullbuffer + (pkt._pesdata - pkt._fullbuffer);
     }
 
-    // may be modified
-    PESPacket(const TSPacket& tspacket)
-        : _ccLast(tspacket.ContinuityCounter()), _pesdataSize(188)
-    { // clone
-        InitPESPacket(const_cast<TSPacket&>(tspacket)); // sets _psiOffset
-
-        int len     = (4*1024) - 256; /* ~4KB */
-        _allocSize  = len + _psiOffset;
-        _fullbuffer = pes_alloc(_allocSize);
-        _pesdata    = _fullbuffer + _psiOffset + 1;
-        memcpy(_fullbuffer, tspacket.data(), TSPacket::kSize);
-    }
-
     // At this point we should have the entire VCT table in buffer
     // at (buffer - 8), and without the tspacket 4 byte header
 
         //if (TableID::TVCT == table_id)
         //VirtualChannelTable vct;
 
-    // may be modified
-    PESPacket(const TSPacket &tspacket,
-              const unsigned char *pesdata, uint pes_size)
-        : _ccLast(tspacket.ContinuityCounter()), _pesdataSize(pes_size)
-    { // clone
-        InitPESPacket(const_cast<TSPacket&>(tspacket)); // sets _psiOffset
-        int len     = pes_size+4;
-        /* make alloc size multiple of 188 */
-        _allocSize  = ((len+_psiOffset+187)/188)*188;
-        _fullbuffer = pes_alloc(_allocSize);
-        _pesdata    = _fullbuffer + _psiOffset + 1;
-        memcpy(_fullbuffer, tspacket.data(), 188);
-        memcpy(_pesdata, pesdata, pes_size-1);
-    }
-
     virtual ~PESPacket()
     {
         if (IsClone())
@@ -131 +76 @@
         _pesdata    = NULL;
     }
 
-    static const PESPacket View(const TSPacket& tspacket)
-        { return PESPacket(&tspacket, false); }
-
-    static PESPacket View(TSPacket& tspacket)
-        { return PESPacket(&tspacket, false); }
-
-    static const PESPacket ViewData(const unsigned char* pesdata)
-        { return PESPacket(pesdata, false); }
-
     bool IsClone() const { return bool(_allocSize); }
 
     // return true if complete or broken