shithub: openh264

Info  •  Files  •  Log  •  Branches

Merge pull request #2091 from HaiboZhu/Bugfix_CheckRefPicturesComplete_FMO_enable

Fix the bug that calculate mbAddr error when FMO enable

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

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

@@ -2446,10 +2446,9 @@

 bool CheckRefPicturesComplete (PWelsDecoderContext pCtx) {

   // Multi Reference, RefIdx may differ

   bool bAllRefComplete = true;

-  int32_t iRealMbIdx;

+  int32_t iRealMbIdx = pCtx->pCurDqLayer->sLayerInfo.sSliceInLayer.sSliceHeaderExt.sSliceHeader.iFirstMbInSlice;

   for (int32_t iMbIdx = 0; bAllRefComplete

        && iMbIdx < pCtx->pCurDqLayer->sLayerInfo.sSliceInLayer.iTotalMbInCurSlice; iMbIdx++) {

-    iRealMbIdx = pCtx->pCurDqLayer->sLayerInfo.sSliceInLayer.sSliceHeaderExt.sSliceHeader.iFirstMbInSlice + iMbIdx;

     switch (pCtx->pCurDqLayer->pMbType[iRealMbIdx]) {

     case MB_TYPE_SKIP:

     case MB_TYPE_16x16:

@@ -2477,6 +2476,8 @@

     default:

       break;

     }

+    iRealMbIdx = (pCtx->pPps->uiNumSliceGroups > 1) ? FmoNextMb (pCtx->pFmo, iRealMbIdx) :

+                 (pCtx->pCurDqLayer->sLayerInfo.sSliceInLayer.sSliceHeaderExt.sSliceHeader.iFirstMbInSlice + iMbIdx);

   }

   return bAllRefComplete;

 }