Ticket #565: offset.diff

pespacket.cpp

@@ -9 +9 @@
 
 using namespace std;
 
-static inline uint calcOffset(uint cnt)
-{
-    return (cnt * TSPacket::PAYLOAD_SIZE) + TSPacket::HEADER_SIZE;
-}
-
 // return true if complete or broken
 bool PESPacket::AddTSPacket(const TSPacket* packet)
 {
@@ -33 +28 @@
 
     const int cc = packet->ContinuityCounter();
     const int ccExp = (_ccLast + 1) & 0xf;
+ 
+    uint payloadSize;
+    uint payloadStart;
+    
+    // If the next TS has an offset, we need to strip it out.
+    // The offset will be used when a new PESPacket is created.
+    if (packet->PayloadStart())
+    {
+        payloadSize = TSPacket::PAYLOAD_SIZE - 1;
+        payloadStart = TSPacket::HEADER_SIZE + 1;
+    }
+    else
+    {
+        payloadSize = TSPacket::PAYLOAD_SIZE;
+        payloadStart = TSPacket::HEADER_SIZE;
+    }
+
     if (ccExp == cc)
     {
-        if (calcOffset(_cnt+1) >= _allocSize)
+        if (_pesdataSize + payloadSize >= _allocSize)
         {
             uint sz = (((_allocSize * 2) + 4095) / 4096) * 4096;
             unsigned char *nbuf = pes_alloc(sz);
-            memcpy(nbuf, _fullbuffer, _allocSize);
+            memcpy(nbuf, _fullbuffer, _pesdataSize);
             pes_free(_fullbuffer);
             _fullbuffer = nbuf;
             _allocSize  = sz;
         }
-        memcpy(_fullbuffer    + calcOffset(_cnt),
-               packet->data() + TSPacket::HEADER_SIZE,
-               TSPacket::PAYLOAD_SIZE);
 
+        memcpy(_fullbuffer    + _pesdataSize,
+               packet->data() + payloadStart,
+               payloadSize);
+
         _ccLast = cc;
-        _cnt++;
+        _pesdataSize += payloadSize;
     }
     else if (int(_ccLast) == cc)
     {
@@ -62 +75 @@
         return true;
     }
 
-    if (calcOffset(_cnt) >= tlen)
+    if (_pesdataSize >= tlen)
     {
         if (CalcCRC()==CRC())
         {

pespacket.h

@@ -49 +49 @@
   protected:
     // does not create it's own data
     PESPacket(const TSPacket* tspacket, bool)
-        : _pesdata(0), _fullbuffer(0), _allocSize(0)
+        : _pesdata(0), _fullbuffer(0), _allocSize(0), _pesdataSize(188)
     {
         InitPESPacket(const_cast<TSPacket&>(*tspacket));
         _fullbuffer = const_cast<unsigned char*>(tspacket->data());
@@ -64 +64 @@
     PESPacket(const PESPacket& pkt)
         : _pesdata(0),
           _psiOffset(pkt._psiOffset),
-          _ccLast(pkt._ccLast), _cnt(pkt._cnt),
+          _ccLast(pkt._ccLast),
           _allocSize((pkt._allocSize) ? pkt._allocSize : 188),
+          _pesdataSize(pkt._pesdataSize),
           _badPacket(pkt._badPacket)
     { // clone
         _fullbuffer = pes_alloc(_allocSize);
@@ -75 +76 @@
 
     // may be modified
     PESPacket(const TSPacket& tspacket)
-        : _ccLast(tspacket.ContinuityCounter()), _cnt(1)
+        : _ccLast(tspacket.ContinuityCounter()), _pesdataSize(188)
     { // clone
         InitPESPacket(const_cast<TSPacket&>(tspacket)); // sets _psiOffset
 
@@ -118 +119 @@
     unsigned int Length() const
         { return (pesdata()[2] & 0x0f) << 8 | pesdata()[3]; }
 
-    unsigned int TSSizeInBuffer() const
-        { return (_cnt * TSPacket::PAYLOAD_SIZE) + TSPacket::HEADER_SIZE; }
+    unsigned int TSSizeInBuffer() const { return _pesdataSize; }
     unsigned int PSIOffset() const { return _psiOffset; }
 
     const unsigned char* pesdata() const { return _pesdata; }
@@ -188 +188 @@
   private:
     uint _psiOffset;    ///< AFCOffset + StartOfFieldPointer
     uint _ccLast;       ///< Continuity counter of last inserted TS Packet
-    uint _cnt;          ///< Number of tspackets contained in PES Packet
     uint _allocSize;    ///< number of bytes we allocated
+    uint _pesdataSize;  ///< Number of bytes containing PES data
     bool _badPacket;    ///< true if a CRC is not good yet
 };