shithub: openh264

Info  •  Files  •  Log  •  Branches

Merge pull request #2022 from sijchen/fix_slc

[Encoder] fix a first-mb judgement

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

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

@@ -862,8 +862,8 @@

   const int32_t  kiPartitaionId = pCurSlice->uiSliceIdx % kiActiveThreadsNum;

   const int32_t  kiLastMbIdxInPartition = pEncCtx->pCurDqLayer->pLastMbIdxOfPartition[kiPartitaionId];

-  const bool    kbCurMbNotFirstMbOfCurSlice      = (pSliceCtx->pOverallMbMap[iCurMbIdx] ==

-      pSliceCtx->pOverallMbMap[iCurMbIdx - 1]);

+  const bool    kbCurMbNotFirstMbOfCurSlice      = ((iCurMbIdx > 0) && (pSliceCtx->pOverallMbMap[iCurMbIdx] ==

+      pSliceCtx->pOverallMbMap[iCurMbIdx - 1]));

   const bool    kbCurMbNotLastMbOfCurPartition = iCurMbIdx < kiLastMbIdxInPartition;

   if (pCurSlice->bDynamicSlicingSliceSizeCtrlFlag)