TS optimize, specifically MPEG2 speedup

lib/nal.cpp

@@ -5,10 +5,10 @@
 #include <cstring>
 #include <math.h> //for log
 
-#include "nal.h"
-#include "bitstream.h"
 #include "bitfields.h"
+#include "bitstream.h"
 #include "defines.h"
+#include "nal.h"
 
 namespace nalu{
   std::deque<int> parseNalSizes(DTSC::Packet &pack){
@@ -34,7 +34,8 @@ namespace nalu {
     unsigned int dataLen = data.size();
     unsigned int resPtr = 2;
     while (dataPtr + 2 < dataLen){
-      if (!data[dataPtr] && !data[dataPtr + 1] && data[dataPtr + 2] == 3){ //We have found an emulation prevention
+      if (!data[dataPtr] && !data[dataPtr + 1] &&
+          data[dataPtr + 2] == 3){// We have found an emulation prevention
         result[resPtr++] = data[dataPtr++];
         result[resPtr++] = data[dataPtr++];
         dataPtr++; // Skip the emulation prevention byte
@@ -43,17 +44,13 @@ namespace nalu {
       }
     }
 
-    while (dataPtr < dataLen){
-      result[resPtr++] = data[dataPtr++];
-    }
+    while (dataPtr < dataLen){result[resPtr++] = data[dataPtr++];}
     return result.substr(0, resPtr);
   }
 
   unsigned long toAnnexB(const char *data, unsigned long dataSize, char *&result){
     // toAnnexB keeps the same size.
-    if (!result){
-      result = (char *)malloc(dataSize);
-    }
+    if (!result){result = (char *)malloc(dataSize);}
     int offset = 0;
     while (offset < dataSize){
       // Read unit size
@@ -71,9 +68,7 @@ namespace nalu {
 
   /// Scans data for the last non-zero byte, returning a pointer to it.
   const char *nalEndPosition(const char *data, uint32_t dataSize){
-    while(dataSize > 0 && memcmp(data+dataSize-1, "\000",1) == 0 ){
-      dataSize--;
-    }
+    while (dataSize && !data[dataSize - 1]){--dataSize;}
     return data + dataSize;
   }
 
@@ -88,13 +83,13 @@ namespace nalu {
         continue;
       }
       if (!offset[2]){
-        //We skip forward 1 or 2 bytes depending on contents of the second byte
-        offset += (offset[1]?2:1);
+        // We COULD skip forward 1 or 2 bytes depending on contents of the second byte
+        // offset += (offset[1]?2:1);
+        //... but skipping a single byte (removing the 'if') is actually faster (benchmarked).
+        ++offset;
         continue;
       }
-      if (!offset[0] && !offset[1]){
-        return offset;
-      }
+      if (!offset[0] && !offset[1]){return offset;}
       // We have no zero in the third byte, so we need to skip at least 3 bytes forward
       offset += 3;
     }
@@ -113,9 +108,7 @@ namespace nalu {
       const char *begin = data + offset;
       while (begin < lastCheck && !(!begin[0] && !begin[1] && begin[2] == 0x01)){
         begin++;
-        if (begin < lastCheck && begin[0]){
-          begin++;
-        }
+        if (begin < lastCheck && begin[0]){begin++;}
       }
       begin += 3; // Initialize begin after the first 0x000001 pattern.
       if (begin > data + dataSize){
@@ -123,13 +116,9 @@ namespace nalu {
         continue;
       }
       const char *end = (const char *)memmem(begin, dataSize - (begin - data), "\000\000\001", 3);
-      if (!end) {
-        end = data + dataSize;
-      }
+      if (!end){end = data + dataSize;}
       // Check for 4-byte lead in's. Yes, we access -1 here
-      if (end > begin && (end - data) != dataSize && end[-1] == 0x00){
-        end--;
-      }
+      if (end > begin && (end - data) != dataSize && end[-1] == 0x00){end--;}
       unsigned int nalSize = end - begin;
       Bit::htobl(result + newOffset, nalSize);
       memcpy(result + newOffset + 4, begin, nalSize);
@@ -139,4 +128,5 @@ namespace nalu {
     }
     return newOffset;
   }
-}
+}// namespace nalu
+

lib/ts_stream.cpp

@@ -132,8 +132,8 @@ namespace TS{
     int tid = newPack.getPID();
     bool unitStart = newPack.getUnitStart();
     std::deque<Packet> & PS = pesStreams[tid];
-    if ((pidToCodec.count(tid) || tid == 0 || newPack.isPMT()) &&
-        (unitStart || PS.size())){
+    if ((unitStart || PS.size()) &&
+        (tid == 0 || newPack.isPMT() || pidToCodec.count(tid))){
       PS.push_back(newPack);
       if (unitStart){
         pesPositions[tid].push_back(bytePos);
@@ -667,13 +667,16 @@ namespace TS{
         return;
       }
 
-      while (nextPtr < pesEnd){
+      uint32_t nalno = 0;
+      //We only check the first 8 packets, because keys should always be near the front of a PES.
+      while (nextPtr < pesEnd && nalno < 8){
         if (!nextPtr){nextPtr = pesEnd;}
         //Calculate size of NAL unit, removing null bytes from the end
         nalSize = nalu::nalEndPosition(pesPayload, nextPtr - pesPayload) - pesPayload;
 
         // Check if this is a keyframe
         parseNal(tid, pesPayload, nextPtr, isKeyFrame);
+        ++nalno;
 
         if (((nextPtr - pesPayload) + 3) >= realPayloadSize){break;}//end of the loop
         realPayloadSize -= ((nextPtr - pesPayload) + 3); // decrease the total size