ref: 2c796337baa11227bd7299464ee43b2618090777
parent: 1449c83f57ad535cadc79a4f81eab95592c5858e
parent: b1f596fd6990470619b5c76a1777121434da838c
author: Licai Guo <[email protected]>
date: Mon Mar 17 04:46:25 EDT 2014
Merge pull request #510 from huili2/remove_basemb remove BASE_MB related code
--- a/codec/decoder/core/inc/parse_mb_syn_cavlc.h
+++ b/codec/decoder/core/inc/parse_mb_syn_cavlc.h
@@ -186,7 +186,6 @@
int32_t iResidualProperty,
/*short *tCoeffLevel,*/
int16_t* pTCoeff,
- int32_t iMbMode,
uint8_t uiQp,
PWelsDecoderContext pCtx);
--- a/codec/decoder/core/inc/wels_const.h
+++ b/codec/decoder/core/inc/wels_const.h
@@ -95,11 +95,4 @@
#define MAX_ACCESS_UNIT_CAPACITY 1048576 // Maximal AU capacity in bytes: (1<<20) = 1024 KB predefined
#define MAX_MACROBLOCK_CAPACITY 5000 //Maximal legal MB capacity, 15000 bits is enough
-enum {- BASE_MB = 0,
- NON_AVC_REWRITE_ENHANCE_MB = 1,
- AVC_REWRITE_ENHANCE_MB = 2
-
-};
-
#endif//WELS_CONSTANCE_H__
--- a/codec/decoder/core/src/decode_slice.cpp
+++ b/codec/decoder/core/src/decode_slice.cpp
@@ -444,7 +444,7 @@
int32_t iMbX = pCurLayer->iMbX;
int32_t iMbY = pCurLayer->iMbY;
int32_t iMbXy = pCurLayer->iMbXyIndex;
- int32_t iNMbMode, i;
+ int32_t i;
uint32_t uiMbType = 0, uiCbp = 0, uiCbpL = 0, uiCbpC = 0;
uint32_t uiCode;
int32_t iCode;
@@ -542,8 +542,6 @@
}
}
- iNMbMode = BASE_MB;
-
memset (pCurLayer->pScaledTCoeff[iMbXy], 0, 384 * sizeof (pCurLayer->pScaledTCoeff[iMbXy][0]));
ST32 (&pCurLayer->pNzc[iMbXy][0], 0);
ST32 (&pCurLayer->pNzc[iMbXy][4], 0);
@@ -592,7 +590,7 @@
if (MB_TYPE_INTRA16x16 == pCurLayer->pMbType[iMbXy]) {//step1: Luma DC
if (WelsResidualBlockCavlc (pVlcTable, pNonZeroCount, pBs, 0, 16,
- g_kuiLumaDcZigzagScan, I16_LUMA_DC, pCurLayer->pScaledTCoeff[iMbXy], iNMbMode, pCurLayer->pLumaQp[iMbXy], pCtx)) {+ g_kuiLumaDcZigzagScan, I16_LUMA_DC, pCurLayer->pScaledTCoeff[iMbXy], pCurLayer->pLumaQp[iMbXy], pCtx)) {return -1;//abnormal
}
//step2: Luma AC
@@ -600,7 +598,7 @@
for (i = 0; i < 16; i++) {if (WelsResidualBlockCavlc (pVlcTable, pNonZeroCount, pBs, i,
iScanIdxEnd - WELS_MAX (iScanIdxStart, 1) + 1, g_kuiZigzagScan + WELS_MAX (iScanIdxStart, 1),
- I16_LUMA_AC, pCurLayer->pScaledTCoeff[iMbXy] + (i << 4), iNMbMode, pCurLayer->pLumaQp[iMbXy], pCtx)) {+ I16_LUMA_AC, pCurLayer->pScaledTCoeff[iMbXy] + (i << 4), pCurLayer->pLumaQp[iMbXy], pCtx)) {return -1;//abnormal
}
}
@@ -617,7 +615,7 @@
//Luma (DC and AC decoding together)
if (WelsResidualBlockCavlc (pVlcTable, pNonZeroCount, pBs, iIndex,
iScanIdxEnd - iScanIdxStart + 1, g_kuiZigzagScan + iScanIdxStart,
- LUMA_DC_AC, pCurLayer->pScaledTCoeff[iMbXy] + (iIndex << 4), iNMbMode, pCurLayer->pLumaQp[iMbXy], pCtx)) {+ LUMA_DC_AC, pCurLayer->pScaledTCoeff[iMbXy] + (iIndex << 4), pCurLayer->pLumaQp[iMbXy], pCtx)) {return -1;//abnormal
}
iIndex++;
@@ -639,7 +637,7 @@
for (i = 0; i < 2; i++) { //Cb Crif (WelsResidualBlockCavlc (pVlcTable, pNonZeroCount, pBs,
16 + (i << 2), 4, g_kuiChromaDcScan, CHROMA_DC, pCurLayer->pScaledTCoeff[iMbXy] + 256 + (i << 6),
- iNMbMode, pCurLayer->pChromaQp[iMbXy], pCtx)) {+ pCurLayer->pChromaQp[iMbXy], pCtx)) {return -1;//abnormal
}
}
@@ -652,7 +650,7 @@
for (iId4x4 = 0; iId4x4 < 4; iId4x4++) {if (WelsResidualBlockCavlc (pVlcTable, pNonZeroCount, pBs, iIndex,
iScanIdxEnd - WELS_MAX (iScanIdxStart, 1) + 1, g_kuiZigzagScan + WELS_MAX (iScanIdxStart, 1),
- CHROMA_AC, pCurLayer->pScaledTCoeff[iMbXy] + (iIndex << 4), iNMbMode, pCurLayer->pChromaQp[iMbXy], pCtx)) {+ CHROMA_AC, pCurLayer->pScaledTCoeff[iMbXy] + (iIndex << 4), pCurLayer->pChromaQp[iMbXy], pCtx)) {return -1;//abnormal
}
iIndex++;
@@ -712,7 +710,7 @@
int32_t iMbY = pCurLayer->iMbY;
int32_t iMbXy = pCurLayer->iMbXyIndex;
- int32_t iNMbMode, i;
+ int32_t i;
uint32_t uiMbType = 0, uiCbp = 0, uiCbpL = 0, uiCbpC = 0;
uint32_t uiCode;
int32_t iCode;
@@ -740,7 +738,6 @@
}
if (pCurLayer->pResidualPredFlag[iMbXy] == 0) {- iNMbMode = BASE_MB;
pCurLayer->pInterPredictionDoneFlag[iMbXy] = 0;
} else {WelsLog (pCtx, WELS_LOG_WARNING, "residual_pred_flag = 1 not supported.\n");
@@ -817,7 +814,6 @@
if (pCtx->pParseIntra4x4ModeFunc (&sNeighAvail, pIntraPredMode, pBs, pCurLayer)) {return -1;
}
- iNMbMode = BASE_MB;
} else { //I_PCM exclude, we can ignore itpCurLayer->pMbType[iMbXy] = MB_TYPE_INTRA16x16;
pCurLayer->pIntraPredMode[iMbXy][7] = (uiMbType - 1) & 3;
@@ -828,7 +824,6 @@
if (pCtx->pParseIntra16x16ModeFunc (&sNeighAvail, pBs, pCurLayer)) {return -1;
}
- iNMbMode = BASE_MB;
}
}
}
@@ -851,22 +846,20 @@
uiCbpL = pCurLayer->pCbp[iMbXy] & 15;
}
- if (iNMbMode == BASE_MB) {- pCtx->sBlockFunc.pWelsBlockZero16x16Func (pCurLayer->pScaledTCoeff[iMbXy], 16);
- pCtx->sBlockFunc.pWelsBlockZero8x8Func (pCurLayer->pScaledTCoeff[iMbXy] + 256, 8);
- pCtx->sBlockFunc.pWelsBlockZero8x8Func (pCurLayer->pScaledTCoeff[iMbXy] + 256 + 64, 8);
+ pCtx->sBlockFunc.pWelsBlockZero16x16Func (pCurLayer->pScaledTCoeff[iMbXy], 16);
+ pCtx->sBlockFunc.pWelsBlockZero8x8Func (pCurLayer->pScaledTCoeff[iMbXy] + 256, 8);
+ pCtx->sBlockFunc.pWelsBlockZero8x8Func (pCurLayer->pScaledTCoeff[iMbXy] + 256 + 64, 8);
- ST32 (&pCurLayer->pNzc[iMbXy][0], 0);
- ST32 (&pCurLayer->pNzc[iMbXy][4], 0);
- ST32 (&pCurLayer->pNzc[iMbXy][8], 0);
- ST32 (&pCurLayer->pNzc[iMbXy][12], 0);
- ST32 (&pCurLayer->pNzc[iMbXy][16], 0);
- ST32 (&pCurLayer->pNzc[iMbXy][20], 0);
- if (pCurLayer->pCbp[iMbXy] == 0 && !IS_INTRA16x16 (pCurLayer->pMbType[iMbXy]) && !IS_I_BL (pCurLayer->pMbType[iMbXy])) {- pCurLayer->pLumaQp[iMbXy] = pSlice->iLastMbQp;
- pCurLayer->pChromaQp[iMbXy] = g_kuiChromaQp[WELS_CLIP3 (pCurLayer->pLumaQp[iMbXy] +
- pSliceHeader->pPps->iChromaQpIndexOffset, 0, 51)];
- }
+ ST32 (&pCurLayer->pNzc[iMbXy][0], 0);
+ ST32 (&pCurLayer->pNzc[iMbXy][4], 0);
+ ST32 (&pCurLayer->pNzc[iMbXy][8], 0);
+ ST32 (&pCurLayer->pNzc[iMbXy][12], 0);
+ ST32 (&pCurLayer->pNzc[iMbXy][16], 0);
+ ST32 (&pCurLayer->pNzc[iMbXy][20], 0);
+ if (pCurLayer->pCbp[iMbXy] == 0 && !IS_INTRA16x16 (pCurLayer->pMbType[iMbXy]) && !IS_I_BL (pCurLayer->pMbType[iMbXy])) {+ pCurLayer->pLumaQp[iMbXy] = pSlice->iLastMbQp;
+ pCurLayer->pChromaQp[iMbXy] = g_kuiChromaQp[WELS_CLIP3 (pCurLayer->pLumaQp[iMbXy] +
+ pSliceHeader->pPps->iChromaQpIndexOffset, 0, 51)];
}
if (pCurLayer->pCbp[iMbXy] || MB_TYPE_INTRA16x16 == pCurLayer->pMbType[iMbXy]) {@@ -901,7 +894,7 @@
if (MB_TYPE_INTRA16x16 == pCurLayer->pMbType[iMbXy]) {//step1: Luma DC
if (WelsResidualBlockCavlc (pVlcTable, pNonZeroCount, pBs, 0, 16, g_kuiLumaDcZigzagScan,
- I16_LUMA_DC, pCurLayer->pScaledTCoeff[iMbXy], iNMbMode, pCurLayer->pLumaQp[iMbXy], pCtx)) {+ I16_LUMA_DC, pCurLayer->pScaledTCoeff[iMbXy], pCurLayer->pLumaQp[iMbXy], pCtx)) {return -1;//abnormal
}
//step2: Luma AC
@@ -909,7 +902,7 @@
for (i = 0; i < 16; i++) {if (WelsResidualBlockCavlc (pVlcTable, pNonZeroCount, pBs, i,
iScanIdxEnd - WELS_MAX (iScanIdxStart, 1) + 1, g_kuiZigzagScan + WELS_MAX (iScanIdxStart, 1),
- I16_LUMA_AC, pCurLayer->pScaledTCoeff[iMbXy] + (i << 4), iNMbMode, pCurLayer->pLumaQp[iMbXy], pCtx)) {+ I16_LUMA_AC, pCurLayer->pScaledTCoeff[iMbXy] + (i << 4), pCurLayer->pLumaQp[iMbXy], pCtx)) {return -1;//abnormal
}
}
@@ -926,7 +919,7 @@
//Luma (DC and AC decoding together)
if (WelsResidualBlockCavlc (pVlcTable, pNonZeroCount, pBs, iIndex,
iScanIdxEnd - iScanIdxStart + 1, g_kuiZigzagScan + iScanIdxStart, LUMA_DC_AC,
- pCurLayer->pScaledTCoeff[iMbXy] + (iIndex << 4), iNMbMode, pCurLayer->pLumaQp[iMbXy], pCtx)) {+ pCurLayer->pScaledTCoeff[iMbXy] + (iIndex << 4), pCurLayer->pLumaQp[iMbXy], pCtx)) {return -1;//abnormal
}
iIndex++;
@@ -949,7 +942,7 @@
for (i = 0; i < 2; i++) { //Cb Crif (WelsResidualBlockCavlc (pVlcTable, pNonZeroCount, pBs,
16 + (i << 2), 4, g_kuiChromaDcScan, CHROMA_DC, pCurLayer->pScaledTCoeff[iMbXy] + 256 + (i << 6),
- iNMbMode, pCurLayer->pChromaQp[iMbXy], pCtx)) {+ pCurLayer->pChromaQp[iMbXy], pCtx)) {return -1;//abnormal
}
}
@@ -962,7 +955,7 @@
for (iId4x4 = 0; iId4x4 < 4; iId4x4++) {if (WelsResidualBlockCavlc (pVlcTable, pNonZeroCount, pBs, iIndex,
iScanIdxEnd - WELS_MAX (iScanIdxStart, 1) + 1, g_kuiZigzagScan + WELS_MAX (iScanIdxStart, 1),
- CHROMA_AC, pCurLayer->pScaledTCoeff[iMbXy] + (iIndex << 4), iNMbMode, pCurLayer->pChromaQp[iMbXy], pCtx)) {+ CHROMA_AC, pCurLayer->pScaledTCoeff[iMbXy] + (iIndex << 4), pCurLayer->pChromaQp[iMbXy], pCtx)) {return -1;//abnormal
}
iIndex++;
--- a/codec/decoder/core/src/parse_mb_syn_cavlc.cpp
+++ b/codec/decoder/core/src/parse_mb_syn_cavlc.cpp
@@ -662,7 +662,7 @@
int32_t WelsResidualBlockCavlc (SVlcTable* pVlcTable, uint8_t* pNonZeroCountCache, PBitStringAux pBs, int32_t iIndex,
int32_t iMaxNumCoeff,
- const uint8_t* kpZigzagTable, int32_t iResidualProperty, int16_t* pTCoeff, int32_t iMbMode, uint8_t uiQp,
+ const uint8_t* kpZigzagTable, int32_t iResidualProperty, int16_t* pTCoeff, uint8_t uiQp,
PWelsDecoderContext pCtx) {int32_t iLevel[16], iZerosLeft, iCoeffNum;
int32_t iRun[16] = {0};@@ -740,18 +740,12 @@
if (iResidualProperty == CHROMA_DC) {//chroma dc scaling process, is kpDequantCoeff[0]? LevelScale(qPdc%6,0,0))<<(qPdc/6-6), the transform is done at construction.
- switch (iMbMode) {- case BASE_MB:
- for (i = uiTotalCoeff - 1; i >= 0; --i) {- //FIXME merge into rundecode?
- int32_t j;
- iCoeffNum += iRun[i] + 1; //FIXME add 1 earlier ?
- j = kpZigzagTable[ iCoeffNum ];
- pTCoeff[j] = iLevel[i] * kpDequantCoeff[0];
- }
- break;
- default:
- break;
+ for (i = uiTotalCoeff - 1; i >= 0; --i) {+ //FIXME merge into rundecode?
+ int32_t j;
+ iCoeffNum += iRun[i] + 1; //FIXME add 1 earlier ?
+ j = kpZigzagTable[ iCoeffNum ];
+ pTCoeff[j] = iLevel[i] * kpDequantCoeff[0];
}
} else if (iResidualProperty == I16_LUMA_DC) { //DC coefficent, only call in Intra_16x16, base_mode_flag = 0 for (i = uiTotalCoeff - 1; i >= 0; --i) { //FIXME merge into rundecode?@@ -761,17 +755,11 @@
pTCoeff[j] = iLevel[i];
}
} else {- switch (iMbMode) {- case BASE_MB:
- for (i = uiTotalCoeff - 1; i >= 0; --i) { //FIXME merge into rundecode?- int32_t j;
- iCoeffNum += iRun[i] + 1; //FIXME add 1 earlier ?
- j = kpZigzagTable[ iCoeffNum ];
- pTCoeff[j] = iLevel[i] * kpDequantCoeff[j & 0x07];
- }
- break;
- default:
- break;
+ for (i = uiTotalCoeff - 1; i >= 0; --i) { //FIXME merge into rundecode?+ int32_t j;
+ iCoeffNum += iRun[i] + 1; //FIXME add 1 earlier ?
+ j = kpZigzagTable[ iCoeffNum ];
+ pTCoeff[j] = iLevel[i] * kpDequantCoeff[j & 0x07];
}
}
--- a/codec/encoder/core/inc/wels_const.h
+++ b/codec/encoder/core/inc/wels_const.h
@@ -176,12 +176,6 @@
};
enum {- BASE_MB = 0,
- AVC_REWRITE_ENHANCE_MB = 1,
- NON_AVC_REWRITE_ENHANCE_MB = 2
-};
-
-enum {ENC_RETURN_SUCCESS = 0,
ENC_RETURN_MEMALLOCERR = 0x01, //will free memory and uninit
ENC_RETURN_UNSUPPORTED_PARA = 0x02, //unsupported setting