History

Rename some decoder tables to match the name used in the encoder

Martin Storsjö committed 12 years ago

Commit eb7cdf21 parent 4aa22da6 files · +23 −23Browse files

Showing the changes to codec/decoder/core/src/rec_mb.cpp (1 of 6 files). Show all

Unified · Split

codec/decoder/core/src/rec_mb.cpp+3−3
@@ -93,7 +93,7 @@ int32_t RecI4x4Luma (int32_t iMBXY, PWelsDecoderContext pCtx, int16_t* pScoeffLe · 92 unmodified lines
9393
9494 pGetI4x4LumaPredFunc[uiMode] (pPredI4x4, iLumaStride);
9595
96− if (pDqLayer->pNzc[iMBXY][g_kuiMbNonZeroCountIdx[i]]) {
96+ if (pDqLayer->pNzc[iMBXY][g_kuiMbCountScan4Idx[i]]) {
9797 int16_t* pRSI4x4 = &pRS[i << 4];
9898 pIdctResAddPredFunc (pPredI4x4, iLumaStride, pRSI4x4);
9999 }
@@ -149,7 +149,7 @@ int32_t RecI16x16Mb (int32_t iMBXY, PWelsDecoderContext pCtx, int16_t* pScoeffLe · 49 unmodified lines
149149 int16_t* pRSI4x4 = pRS + (i << 4);
150150 uint8_t* pPredI4x4 = pPred + pBlockOffset[i];
151151
152− if (pDqLayer->pNzc[iMBXY][g_kuiMbNonZeroCountIdx[i]] || pRSI4x4[0]) {
152+ if (pDqLayer->pNzc[iMBXY][g_kuiMbCountScan4Idx[i]] || pRSI4x4[0]) {
153153 pIdctResAddPredFunc (pPredI4x4, iYStride, pRSI4x4);
154154 }
155155 }
@@ -454,7 +454,7 @@ int32_t RecChroma (int32_t iMBXY, PWelsDecoderContext pCtx, int16_t* pScoeffLeve · 298 unmodified lines
454454 int16_t* pRSI4x4 = &pRS[j << 4];
455455 uint8_t* pPredI4x4 = pPred + pBlockOffset[j];
456456
457− if (pDqLayer->pNzc[iMBXY][g_kuiMbNonZeroCountIdx[16 + (i << 2) + j]] || pRSI4x4[0]) {
457+ if (pDqLayer->pNzc[iMBXY][g_kuiMbCountScan4Idx[16 + (i << 2) + j]] || pRSI4x4[0]) {
458458 pIdctResAddPredFunc (pPredI4x4, iChromaStride, pRSI4x4);
459459 }
460460 }

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