History

Fix the 8x8 init bug under CAVCL when scalinglist enable

Haibo Zhu committed 11 years ago

Commit 2cd3fc81 parent f9f2bbf1 file · +2 −2Browse files

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

Unified · Split

codec/decoder/core/src/decode_slice.cpp+2−2
@@ -1453,7 +1453,7 @@ int32_t WelsActualDecodeMbCavlcISlice (PWelsDecoderContext pCtx) { · 1452 unmodified lines
1453 } else { //non-MB_TYPE_INTRA16x161453 } else { //non-MB_TYPE_INTRA16x16
1454 if (pCurLayer->pTransformSize8x8Flag[iMbXy]) {1454 if (pCurLayer->pTransformSize8x8Flag[iMbXy]) {
1455 for (iId8x8 = 0; iId8x8 < 4; iId8x8++) {1455 for (iId8x8 = 0; iId8x8 < 4; iId8x8++) {
1456 iMbResProperty = (IS_INTRA (pCurLayer->pMbType[iMbXy])) ? LUMA_DC_AC_INTRA : LUMA_DC_AC_INTER;1456 iMbResProperty = (IS_INTRA (pCurLayer->pMbType[iMbXy])) ? LUMA_DC_AC_INTRA_8 : LUMA_DC_AC_INTER_8;
1457 if (uiCbpL & (1 << iId8x8)) {1457 if (uiCbpL & (1 << iId8x8)) {
1458 int32_t iIndex = (iId8x8 << 2);1458 int32_t iIndex = (iId8x8 << 2);
1459 for (iId4x4 = 0; iId4x4 < 4; iId4x4++) {1459 for (iId4x4 = 0; iId4x4 < 4; iId4x4++) {
@@ -1815,7 +1815,7 @@ int32_t WelsActualDecodeMbCavlcPSlice (PWelsDecoderContext pCtx) { · 355 unmodified lines
1815 } else { //non-MB_TYPE_INTRA16x161815 } else { //non-MB_TYPE_INTRA16x16
1816 if (pCurLayer->pTransformSize8x8Flag[iMbXy]) {1816 if (pCurLayer->pTransformSize8x8Flag[iMbXy]) {
1817 for (iId8x8 = 0; iId8x8 < 4; iId8x8++) {1817 for (iId8x8 = 0; iId8x8 < 4; iId8x8++) {
1818 iMbResProperty = (IS_INTRA (pCurLayer->pMbType[iMbXy])) ? LUMA_DC_AC_INTRA : LUMA_DC_AC_INTER;1818 iMbResProperty = (IS_INTRA (pCurLayer->pMbType[iMbXy])) ? LUMA_DC_AC_INTRA_8 : LUMA_DC_AC_INTER_8;
1819 if (uiCbpL & (1 << iId8x8)) {1819 if (uiCbpL & (1 << iId8x8)) {
1820 int32_t iIndex = (iId8x8 << 2);1820 int32_t iIndex = (iId8x8 << 2);
1821 for (iId4x4 = 0; iId4x4 < 4; iId4x4++) {1821 for (iId4x4 = 0; iId4x4 < 4; iId4x4++) {

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t