Showing the changes to codec/decoder/core/src/decode_slice.cpp (1 of 1 file). Show all
Unified · Split
| @@ -617,11 +617,6 @@ int32_t WelsActualDecodeMbCavlcISlice (PWelsDecoderContext pCtx) { · 616 unmodified lines | |||
| 617 | ST32 (&pCurLayer->pNzc[iMbXy][4], LD32 (&pNonZeroCount[1 + 8 * 2])); | 617 | ST32 (&pCurLayer->pNzc[iMbXy][4], LD32 (&pNonZeroCount[1 + 8 * 2])); |
| 618 | ST32 (&pCurLayer->pNzc[iMbXy][8], LD32 (&pNonZeroCount[1 + 8 * 3])); | 618 | ST32 (&pCurLayer->pNzc[iMbXy][8], LD32 (&pNonZeroCount[1 + 8 * 3])); |
| 619 | ST32 (&pCurLayer->pNzc[iMbXy][12], LD32 (&pNonZeroCount[1 + 8 * 4])); | 619 | ST32 (&pCurLayer->pNzc[iMbXy][12], LD32 (&pNonZeroCount[1 + 8 * 4])); |
| 620 | } else { //pNonZeroCount = 0 | ||
| 621 | ST32 (&pCurLayer->pNzc[iMbXy][0], 0); | ||
| 622 | ST32 (&pCurLayer->pNzc[iMbXy][4], 0); | ||
| 623 | ST32 (&pCurLayer->pNzc[iMbXy][8], 0); | ||
| 624 | ST32 (&pCurLayer->pNzc[iMbXy][12], 0); | ||
| 625 | } | 620 | } |
| 626 | } else { //non-MB_TYPE_INTRA16x16 | 621 | } else { //non-MB_TYPE_INTRA16x16 |
| 627 | for (iId8x8 = 0; iId8x8 < 4; iId8x8++) { | 622 | for (iId8x8 = 0; iId8x8 < 4; iId8x8++) { |
| @@ -676,11 +671,6 @@ int32_t WelsActualDecodeMbCavlcISlice (PWelsDecoderContext pCtx) { · 48 unmodified lines | |||
| 676 | ST16 (&pCurLayer->pNzc[iMbXy][20], LD16 (&pNonZeroCount[6 + 8 * 2])); | 671 | ST16 (&pCurLayer->pNzc[iMbXy][20], LD16 (&pNonZeroCount[6 + 8 * 2])); |
| 677 | ST16 (&pCurLayer->pNzc[iMbXy][18], LD16 (&pNonZeroCount[6 + 8 * 4])); | 672 | ST16 (&pCurLayer->pNzc[iMbXy][18], LD16 (&pNonZeroCount[6 + 8 * 4])); |
| 678 | ST16 (&pCurLayer->pNzc[iMbXy][22], LD16 (&pNonZeroCount[6 + 8 * 5])); | 673 | ST16 (&pCurLayer->pNzc[iMbXy][22], LD16 (&pNonZeroCount[6 + 8 * 5])); |
| 679 | } else { | ||
| 680 | ST16 (&pCurLayer->pNzc[iMbXy][16], 0); | ||
| 681 | ST16 (&pCurLayer->pNzc[iMbXy][20], 0); | ||
| 682 | ST16 (&pCurLayer->pNzc[iMbXy][18], 0); | ||
| 683 | ST16 (&pCurLayer->pNzc[iMbXy][22], 0); | ||
| 684 | } | 674 | } |
| 685 | BsEndCavlc (pBs); | 675 | BsEndCavlc (pBs); |
| 686 | } | 676 | } |
| @@ -936,11 +926,6 @@ int32_t WelsActualDecodeMbCavlcPSlice (PWelsDecoderContext pCtx) { · 249 unmodified lines | |||
| 936 | ST32 (&pCurLayer->pNzc[iMbXy][4], LD32 (&pNonZeroCount[1 + 8 * 2])); | 926 | ST32 (&pCurLayer->pNzc[iMbXy][4], LD32 (&pNonZeroCount[1 + 8 * 2])); |
| 937 | ST32 (&pCurLayer->pNzc[iMbXy][8], LD32 (&pNonZeroCount[1 + 8 * 3])); | 927 | ST32 (&pCurLayer->pNzc[iMbXy][8], LD32 (&pNonZeroCount[1 + 8 * 3])); |
| 938 | ST32 (&pCurLayer->pNzc[iMbXy][12], LD32 (&pNonZeroCount[1 + 8 * 4])); | 928 | ST32 (&pCurLayer->pNzc[iMbXy][12], LD32 (&pNonZeroCount[1 + 8 * 4])); |
| 939 | } else { //pNonZeroCount = 0 | ||
| 940 | ST32 (&pCurLayer->pNzc[iMbXy][0], 0); | ||
| 941 | ST32 (&pCurLayer->pNzc[iMbXy][4], 0); | ||
| 942 | ST32 (&pCurLayer->pNzc[iMbXy][8], 0); | ||
| 943 | ST32 (&pCurLayer->pNzc[iMbXy][12], 0); | ||
| 944 | } | 929 | } |
| 945 | } else { //non-MB_TYPE_INTRA16x16 | 930 | } else { //non-MB_TYPE_INTRA16x16 |
| 946 | for (iId8x8 = 0; iId8x8 < 4; iId8x8++) { | 931 | for (iId8x8 = 0; iId8x8 < 4; iId8x8++) { |
| @@ -996,9 +981,6 @@ int32_t WelsActualDecodeMbCavlcPSlice (PWelsDecoderContext pCtx) { · 49 unmodified lines | |||
| 996 | ST16 (&pCurLayer->pNzc[iMbXy][20], LD16 (&pNonZeroCount[6 + 8 * 2])); | 981 | ST16 (&pCurLayer->pNzc[iMbXy][20], LD16 (&pNonZeroCount[6 + 8 * 2])); |
| 997 | ST16 (&pCurLayer->pNzc[iMbXy][18], LD16 (&pNonZeroCount[6 + 8 * 4])); | 982 | ST16 (&pCurLayer->pNzc[iMbXy][18], LD16 (&pNonZeroCount[6 + 8 * 4])); |
| 998 | ST16 (&pCurLayer->pNzc[iMbXy][22], LD16 (&pNonZeroCount[6 + 8 * 5])); | 983 | ST16 (&pCurLayer->pNzc[iMbXy][22], LD16 (&pNonZeroCount[6 + 8 * 5])); |
| 999 | } else { | ||
| 1000 | ST32 (&pCurLayer->pNzc[iMbXy][16], 0); | ||
| 1001 | ST32 (&pCurLayer->pNzc[iMbXy][20], 0); | ||
| 1002 | } | 984 | } |
| 1003 | BsEndCavlc (pBs); | 985 | BsEndCavlc (pBs); |
| 1004 | } | 986 | } |