History

Merge pull request #1418 from huili2/EC_option_bugfix

ec disable bug fix

HaiboZhu committed 12 years ago

Commit 1a78f692 parents d1a3bd3 869c5671 file · +3 −2Browse files

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

Unified · Split

codec/decoder/core/src/decoder_core.cpp+3−2
@@ -1982,7 +1982,7 @@ int32_t DecodeCurrentAccessUnit (PWelsDecoderContext pCtx, uint8_t** ppDst, SBuf · 1981 unmodified lines
1982 if (dq_cur->uiLayerDqId == kuiTargetLayerDqId) {1982 if (dq_cur->uiLayerDqId == kuiTargetLayerDqId) {
1983 if (!pCtx->bInstantDecFlag) {1983 if (!pCtx->bInstantDecFlag) {
1984 //Do error concealment here1984 //Do error concealment here
1985 if (NeedErrorCon (pCtx)) {1985 if ((NeedErrorCon (pCtx)) && (pCtx->eErrorConMethod != ERROR_CON_DISABLE)) {
1986 ImplementErrorCon (pCtx);1986 ImplementErrorCon (pCtx);
1987 pCtx->iTotalNumMbRec = pCtx->pSps->iMbWidth * pCtx->pSps->iMbHeight;1987 pCtx->iTotalNumMbRec = pCtx->pSps->iMbWidth * pCtx->pSps->iMbHeight;
1988 pCtx->pDec->iSpsId = pCtx->pSps->iSpsId;1988 pCtx->pDec->iSpsId = pCtx->pSps->iSpsId;
@@ -2039,7 +2039,8 @@ bool CheckAndFinishLastPic (PWelsDecoderContext pCtx, uint8_t** ppDst, SBufferIn · 50 unmodified lines
2039 MarkECFrameAsRef (pCtx);2039 MarkECFrameAsRef (pCtx);
2040 }2040 }
2041 } else {2041 } else {
2042 DecodeFrameConstruction (pCtx, ppDst, pDstInfo);2042 if (DecodeFrameConstruction (pCtx, ppDst, pDstInfo))
2043 return false;
2043 }2044 }
2044 pCtx->iPrevFrameNum = pCtx->sLastSliceHeader.iFrameNum; //save frame_num2045 pCtx->iPrevFrameNum = pCtx->sLastSliceHeader.iFrameNum; //save frame_num
2045 if (pCtx->bLastHasMmco5)2046 if (pCtx->bLastHasMmco5)

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