Fix max slice group number judgement error in FMO

Haibo Zhu committed 11 years ago

Commit 663bd941 parent f743f041 file · +2 −2Browse files

Showing the changes to codec/decoder/core/src/fmo.cpp (1 of 1 file). Show all

Unified · Split

codec/decoder/core/src/fmo.cpp+2−2

@@ -59,7 +59,7 @@ static inline int32_t FmoGenerateMbAllocMapType0 (PFmo pFmo, PPps pPps) { · 58 unmodified lines
59	WELS_VERIFY_RETURN_IF (1, (NULL == pFmo \|\| NULL == pPps))	59	WELS_VERIFY_RETURN_IF (1, (NULL == pFmo \|\| NULL == pPps))
60	uiNumSliceGroups = pPps->uiNumSliceGroups;	60	uiNumSliceGroups = pPps->uiNumSliceGroups;
61	iMbNum = pFmo->iCountMbNum;	61	iMbNum = pFmo->iCountMbNum;
62	WELS_VERIFY_RETURN_IF (1, (NULL == pFmo->pMbAllocMap \|\| iMbNum <= 0 \|\| uiNumSliceGroups >= MAX_SLICEGROUP_IDS))	62	WELS_VERIFY_RETURN_IF (1, (NULL == pFmo->pMbAllocMap \|\| iMbNum <= 0 \|\| uiNumSliceGroups > MAX_SLICEGROUP_IDS))
63		63
64	do {	64	do {
65	uint8_t uiGroup = 0;	65	uint8_t uiGroup = 0;
@@ -95,7 +95,7 @@ static inline int32_t FmoGenerateMbAllocMapType1 (PFmo pFmo, PPps pPps, const in · 29 unmodified lines
95	uiNumSliceGroups = pPps->uiNumSliceGroups;	95	uiNumSliceGroups = pPps->uiNumSliceGroups;
96	iMbNum = pFmo->iCountMbNum;	96	iMbNum = pFmo->iCountMbNum;
97	WELS_VERIFY_RETURN_IF (1, (NULL == pFmo->pMbAllocMap \|\| iMbNum <= 0 \|\| kiMbWidth == 0	97	WELS_VERIFY_RETURN_IF (1, (NULL == pFmo->pMbAllocMap \|\| iMbNum <= 0 \|\| kiMbWidth == 0
98	\|\| uiNumSliceGroups >= MAX_SLICEGROUP_IDS))	98	\|\| uiNumSliceGroups > MAX_SLICEGROUP_IDS))
99		99
100	do {	100	do {
101	pFmo->pMbAllocMap[i] = (uint8_t) (((i % kiMbWidth) + (((i / kiMbWidth) * uiNumSliceGroups) >> 1)) % uiNumSliceGroups);	101	pFmo->pMbAllocMap[i] = (uint8_t) (((i % kiMbWidth) + (((i / kiMbWidth) * uiNumSliceGroups) >> 1)) % uiNumSliceGroups);