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