shithub: openh264

Info  •  Files  •  Log  •  Branches

Merge pull request #2613 from ruil2/memory_issue

fix memory lenght issue

--- a/codec/encoder/core/src/set_mb_syn_cavlc.cpp

+++ b/codec/encoder/core/src/set_mb_syn_cavlc.cpp

@@ -251,7 +251,8 @@

   SCabacCtx* pCtx = &pSlice->sCabacCtx;

   memcpy (&pDss->sStoredCabac, pCtx, sizeof (SCabacCtx));

   if (pDss->pRestoreBuffer) {

-    int32_t iLen = GetBsPosCabac (pSlice) - pDss->iStartPos;

+    int32_t iPosBitOffset =  GetBsPosCabac (pSlice) - pDss->iStartPos;

+    int32_t iLen = ((iPosBitOffset >> 3) + ((iPosBitOffset & 0x07) ? 1 : 0));

     memcpy (pDss->pRestoreBuffer, pCtx->m_pBufStart, iLen);

   }

   pDss->uiLastMbQp =  pSlice->uiLastMbQp;

@@ -260,9 +261,9 @@

 int32_t StashPopMBStatusCabac (SDynamicSlicingStack* pDss, SSlice* pSlice) {

   SCabacCtx* pCtx = &pSlice->sCabacCtx;

   memcpy (pCtx, &pDss->sStoredCabac, sizeof (SCabacCtx));

-

   if (pDss->pRestoreBuffer) {

-    int32_t iLen = GetBsPosCabac (pSlice) - pDss->iStartPos;

+    int32_t iPosBitOffset = GetBsPosCabac (pSlice) - pDss->iStartPos;

+    int32_t iLen = ((iPosBitOffset >> 3) + ((iPosBitOffset & 0x07) ? 1 : 0));

     memcpy (pCtx->m_pBufStart, pDss->pRestoreBuffer, iLen);

   }

   pSlice->uiLastMbQp = pDss->uiLastMbQp;