shithub: openh264

Info  •  Files  •  Log  •  Branches

Merge pull request #1672 from huili2/parseonly_sizemodif

unify parseonly to have 0x0001

--- a/codec/decoder/core/src/au_parser.cpp

+++ b/codec/decoder/core/src/au_parser.cpp

@@ -306,25 +306,49 @@

       if (pCtx->bParseOnly) {

         pCurNal->sNalData.sVclNal.pNalPos = pSavedData->pCurPos;

-        pCurNal->sNalData.sVclNal.iNalLength = iSrcNalLen - NAL_UNIT_HEADER_EXT_SIZE;

+        int32_t iTrailingZeroByte = 0;

+        while (pSrcNal[iSrcNalLen - iTrailingZeroByte - 1] == 0x0) //remove final trailing 0 bytes

+          iTrailingZeroByte++;

+        int32_t iActualLen = iSrcNalLen - iTrailingZeroByte;

+        pCurNal->sNalData.sVclNal.iNalLength = iActualLen - NAL_UNIT_HEADER_EXT_SIZE;

+        //unify start code as 0x0001

+        int32_t iCurrStartByte = 4; //4 for 0x0001, 3 for 0x001

+        if (pSrcNal[0] == 0x0 && pSrcNal[1] == 0x0 && pSrcNal[2] == 0x1) { //if 0x001

+          iCurrStartByte = 3;

+          pCurNal->sNalData.sVclNal.iNalLength++;

+        }

         if (pCurNal->sNalHeaderExt.bIdrFlag) {

-          * (pSrcNal + 3) &= 0xE0;

-          * (pSrcNal + 3) |= 0x05;

+          * (pSrcNal + iCurrStartByte) &= 0xE0;

+          * (pSrcNal + iCurrStartByte) |= 0x05;

         } else {

-          * (pSrcNal + 3) &= 0xE0;

-          * (pSrcNal + 3) |= 0x01;

+          * (pSrcNal + iCurrStartByte) &= 0xE0;

+          * (pSrcNal + iCurrStartByte) |= 0x01;

         }

-        memcpy (pSavedData->pCurPos, pSrcNal, 4);

-        pSavedData->pCurPos += 4;

-        memcpy (pSavedData->pCurPos, pSrcNal + 7, iSrcNalLen - 7);

-        pSavedData->pCurPos += iSrcNalLen - 7;

+        pSavedData->pCurPos[0] = pSavedData->pCurPos[1] = pSavedData->pCurPos[2] = 0x0;

+        pSavedData->pCurPos[3] = 0x1;

+        pSavedData->pCurPos[4] = * (pSrcNal + iCurrStartByte);

+        pSavedData->pCurPos += 5;

+        int32_t iOffset = iCurrStartByte + 1 + NAL_UNIT_HEADER_EXT_SIZE;

+        memcpy (pSavedData->pCurPos, pSrcNal + iOffset, iActualLen - iOffset);

+        pSavedData->pCurPos += iActualLen - iOffset;

       }

     } else {

       if (pCtx->bParseOnly) {

         pCurNal->sNalData.sVclNal.pNalPos = pSavedData->pCurPos;

-        pCurNal->sNalData.sVclNal.iNalLength = iSrcNalLen;

-        memcpy (pSavedData->pCurPos, pSrcNal, iSrcNalLen);

-        pSavedData->pCurPos += iSrcNalLen;

+        int32_t iTrailingZeroByte = 0;

+        while (pSrcNal[iSrcNalLen - iTrailingZeroByte - 1] == 0x0) //remove final trailing 0 bytes

+          iTrailingZeroByte++;

+        int32_t iActualLen = iSrcNalLen - iTrailingZeroByte;

+        pCurNal->sNalData.sVclNal.iNalLength = iActualLen;

+        //unify start code as 0x0001

+        int32_t iStartDeltaByte = 0; //0 for 0x0001, 1 for 0x001

+        if (pSrcNal[0] == 0x0 && pSrcNal[1] == 0x0 && pSrcNal[2] == 0x1) { //if 0x001

+          pSavedData->pCurPos[0] = 0x0;

+          iStartDeltaByte = 1;

+          pCurNal->sNalData.sVclNal.iNalLength++;

+        }

+        memcpy (pSavedData->pCurPos + iStartDeltaByte, pSrcNal, iActualLen);

+        pSavedData->pCurPos += iStartDeltaByte + iActualLen;

       }

       if (NAL_UNIT_PREFIX == pCtx->sPrefixNal.sNalHeaderExt.sNalUnitHeader.eNalUnitType) {

         if (pCtx->sPrefixNal.sNalData.sPrefixNal.bPrefixNalCorrectFlag) {

@@ -449,9 +473,9 @@

     if (pLastSliceHeader->iDeltaPicOrderCnt[1] != pCurSliceHeader->iDeltaPicOrderCnt[1])

       return true;

   }

-  if(memcmp(pLastSliceHeader->pPps, pCurSliceHeader->pPps, sizeof(SPps)) != 0

-      || memcmp(pLastSliceHeader->pSps, pCurSliceHeader->pSps, sizeof(SSps)) != 0) {

-      return true;

+  if (memcmp (pLastSliceHeader->pPps, pCurSliceHeader->pPps, sizeof (SPps)) != 0

+      || memcmp (pLastSliceHeader->pSps, pCurSliceHeader->pSps, sizeof (SSps)) != 0) {

+    return true;

   }

   return false;

 }

@@ -1065,8 +1089,19 @@

     if (!kbUseSubsetFlag) { //SPS

       SSpsBsInfo* pSpsBs = &pCtx->sSpsBsInfo [iSpsId];

       pSpsBs->iSpsId = iSpsId;

-      memcpy (pSpsBs->pSpsBsBuf, pSrcNal, kSrcNalLen);

-      pSpsBs->uiSpsBsLen = (uint32_t) kSrcNalLen;

+      int32_t iTrailingZeroByte = 0;

+      while (pSrcNal[kSrcNalLen - iTrailingZeroByte - 1] == 0x0) //remove final trailing 0 bytes

+        iTrailingZeroByte++;

+      int32_t iActualLen = kSrcNalLen - iTrailingZeroByte;

+      pSpsBs->uiSpsBsLen = (uint16_t) iActualLen;

+      //unify start code as 0x0001

+      int32_t iStartDeltaByte = 0; //0 for 0x0001, 1 for 0x001

+      if (pSrcNal[0] == 0x0 && pSrcNal[1] == 0x0 && pSrcNal[2] == 0x1) { //if 0x001

+        pSpsBs->pSpsBsBuf[0] = 0x0; //add 0 to form 0x0001

+        iStartDeltaByte++;

+        pSpsBs->uiSpsBsLen++;

+      }

+      memcpy (pSpsBs->pSpsBsBuf + iStartDeltaByte, pSrcNal, iActualLen);

     } else { //subset SPS

       SSpsBsInfo* pSpsBs = &pCtx->sSubsetSpsBsInfo [iSpsId];

       pSpsBs->iSpsId = iSpsId;

@@ -1353,8 +1388,19 @@

     }

     SPpsBsInfo* pPpsBs = &pCtx->sPpsBsInfo [uiPpsId];

     pPpsBs->iPpsId = (int32_t) uiPpsId;

-    memcpy (pPpsBs->pPpsBsBuf, pSrcNal, kSrcNalLen);

-    pPpsBs->uiPpsBsLen = kSrcNalLen;

+    int32_t iTrailingZeroByte = 0;

+    while (pSrcNal[kSrcNalLen - iTrailingZeroByte - 1] == 0x0) //remove final trailing 0 bytes

+      iTrailingZeroByte++;

+    int32_t iActualLen = kSrcNalLen - iTrailingZeroByte;

+    pPpsBs->uiPpsBsLen = (uint16_t) iActualLen;

+    //unify start code as 0x0001

+    int32_t iStartDeltaByte = 0; //0 for 0x0001, 1 for 0x001

+    if (pSrcNal[0] == 0x0 && pSrcNal[1] == 0x0 && pSrcNal[2] == 0x1) { //if 0x001

+      pPpsBs->pPpsBsBuf[0] = 0x0; //add 0 to form 0x0001

+      iStartDeltaByte++;

+      pPpsBs->uiPpsBsLen++;

+    }

+    memcpy (pPpsBs->pPpsBsBuf + iStartDeltaByte, pSrcNal, iActualLen);

   }

   return ERR_NONE;

 }

--- a/test/api/encode_decode_api_test.cpp

+++ b/test/api/encode_decode_api_test.cpp

@@ -2322,9 +2322,9 @@

 const uint32_t kiFrameNum = 100; //DO NOT CHANGE!

 const uint32_t kiMaxBsSize = 10000000; //DO NOT CHANGE!

 const char* pHashStr[] = { //DO NOT CHANGE!

-  "02a5c2dd29af76812f9486d64dd1f4bb6f799405",

-  "45dc93584b9a4f8de60d47c0b5254d78541428e6",

-  "d62c2115520207444d481ddde0ea60d938a15c72"

+  "adb1513673053e9d228a4ab5429c8cfdadca3eb0",

+  "e5d2db6f404acd13c420279927c1453b3a559a6e",

+  "24ac736048cc85c672b4b8516eb26215ca80f2c4"

 };

 class DecodeParseAPI : public EncodeDecodeTestBase {