shithub: openh264

Download patch

ref: 49018213280e9acab7bc5c3ec26fc33c305d5814
parent: f9f2bbf805ebb82d0cc46dd79aade2dfb264f046
parent: 2cd3fc805d2f14242254cb17d3a2a71696c34ce8
author: huili2 <[email protected]>
date: Thu Oct 8 12:36:16 EDT 2015 

Merge pull request #2137 from HaiboZhu/Bugfix_CAVCL_8x8_init_error

Fix the 8x8 init bug under CAVCL when scalinglist enable


--- a/codec/decoder/core/src/decode_slice.cpp
+++ b/codec/decoder/core/src/decode_slice.cpp
@@ -1453,7 +1453,7 @@
     } else { //non-MB_TYPE_INTRA16x16
       if (pCurLayer->pTransformSize8x8Flag[iMbXy]) {
         for (iId8x8 = 0; iId8x8 < 4; iId8x8++) {
-          iMbResProperty = (IS_INTRA (pCurLayer->pMbType[iMbXy])) ? LUMA_DC_AC_INTRA : LUMA_DC_AC_INTER;
+          iMbResProperty = (IS_INTRA (pCurLayer->pMbType[iMbXy])) ? LUMA_DC_AC_INTRA_8 : LUMA_DC_AC_INTER_8;
           if (uiCbpL & (1 << iId8x8)) {
             int32_t iIndex = (iId8x8 << 2);
             for (iId4x4 = 0; iId4x4 < 4; iId4x4++) {
@@ -1815,7 +1815,7 @@
     } else { //non-MB_TYPE_INTRA16x16
       if (pCurLayer->pTransformSize8x8Flag[iMbXy]) {
         for (iId8x8 = 0; iId8x8 < 4; iId8x8++) {
-          iMbResProperty = (IS_INTRA (pCurLayer->pMbType[iMbXy])) ? LUMA_DC_AC_INTRA : LUMA_DC_AC_INTER;
+          iMbResProperty = (IS_INTRA (pCurLayer->pMbType[iMbXy])) ? LUMA_DC_AC_INTRA_8 : LUMA_DC_AC_INTER_8;
           if (uiCbpL & (1 << iId8x8)) {
             int32_t iIndex = (iId8x8 << 2);
             for (iId4x4 = 0; iId4x4 < 4; iId4x4++) {