Showing the changes to codec/decoder/core/src/decoder_core.cpp (1 of 1 file). Show all
Unified · Split
| @@ -1965,7 +1965,7 @@ int32_t DecodeCurrentAccessUnit (PWelsDecoderContext pCtx, uint8_t** ppDst, SBuf · 1964 unmodified lines | ||
| 1965 | 1965 | if (dq_cur->uiLayerDqId == kuiTargetLayerDqId) { |
| 1966 | 1966 | if (!pCtx->bInstantDecFlag) { |
| 1967 | 1967 | //Do error concealment here |
| 1968 | − if (NeedErrorCon (pCtx)) { | |
| 1968 | + if ((NeedErrorCon (pCtx)) && (pCtx->eErrorConMethod != ERROR_CON_DISABLE)) { | |
| 1969 | 1969 | ImplementErrorCon (pCtx); |
| 1970 | 1970 | pCtx->iTotalNumMbRec = pCtx->pSps->iMbWidth * pCtx->pSps->iMbHeight; |
| 1971 | 1971 | pCtx->pDec->iSpsId = pCtx->pSps->iSpsId; |
| @@ -2022,7 +2022,8 @@ bool CheckAndFinishLastPic (PWelsDecoderContext pCtx, uint8_t** ppDst, SBufferIn · 50 unmodified lines | ||
| 2022 | 2022 | MarkECFrameAsRef (pCtx); |
| 2023 | 2023 | } |
| 2024 | 2024 | } else { |
| 2025 | − DecodeFrameConstruction (pCtx, ppDst, pDstInfo); | |
| 2025 | + if (DecodeFrameConstruction (pCtx, ppDst, pDstInfo)) | |
| 2026 | + return false; | |
| 2026 | 2027 | } |
| 2027 | 2028 | pCtx->iPrevFrameNum = pCtx->sLastSliceHeader.iFrameNum; //save frame_num |
| 2028 | 2029 | if (pCtx->bLastHasMmco5) |