shithub: openh264

Info  •  Files  •  Log  •  Branches

Merge pull request #2033 from HaiboZhu/Bugfix_FMO_judgement_error

Fix max slice group number judgement error in FMO

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

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

@@ -59,7 +59,7 @@

   WELS_VERIFY_RETURN_IF (1, (NULL == pFmo || NULL == pPps))

   uiNumSliceGroups = pPps->uiNumSliceGroups;

   iMbNum = pFmo->iCountMbNum;

-  WELS_VERIFY_RETURN_IF (1, (NULL == pFmo->pMbAllocMap || iMbNum <= 0 || uiNumSliceGroups >= MAX_SLICEGROUP_IDS))

+  WELS_VERIFY_RETURN_IF (1, (NULL == pFmo->pMbAllocMap || iMbNum <= 0 || uiNumSliceGroups > MAX_SLICEGROUP_IDS))

   do {

     uint8_t uiGroup = 0;

@@ -95,7 +95,7 @@

   uiNumSliceGroups = pPps->uiNumSliceGroups;

   iMbNum = pFmo->iCountMbNum;

   WELS_VERIFY_RETURN_IF (1, (NULL == pFmo->pMbAllocMap || iMbNum <= 0 || kiMbWidth == 0

-                             || uiNumSliceGroups >= MAX_SLICEGROUP_IDS))

+                             || uiNumSliceGroups > MAX_SLICEGROUP_IDS))

   do {

     pFmo->pMbAllocMap[i] = (uint8_t) (((i % kiMbWidth) + (((i / kiMbWidth) * uiNumSliceGroups) >> 1)) % uiNumSliceGroups);