Showing the changes to codec/decoder/core/src/decoder_core.cpp (1 of 4 files). Show all
Unified · Split
| @@ -1657,7 +1657,6 @@ int32_t ConstructAccessUnit (PWelsDecoderContext pCtx, uint8_t** ppDst, SBufferI · 1656 unmodified lines | |||
| 1657 | WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "sync picture resolution ext failed, the error is %d", iErr); | 1657 | WelsLog (& (pCtx->sLogCtx), WELS_LOG_WARNING, "sync picture resolution ext failed, the error is %d", iErr); |
| 1658 | return iErr; | 1658 | return iErr; |
| 1659 | } | 1659 | } |
| 1660 | InitErrorCon (pCtx); //Do EC initialization here, for sequence start | ||
| 1661 | } | 1660 | } |
| 1662 | 1661 | ||
| 1663 | 1662 | ||
| @@ -1969,6 +1968,8 @@ int32_t DecodeCurrentAccessUnit (PWelsDecoderContext pCtx, uint8_t** ppDst, SBuf · 305 unmodified lines | |||
| 1969 | if (NeedErrorCon (pCtx)) { | 1968 | if (NeedErrorCon (pCtx)) { |
| 1970 | ImplementErrorCon (pCtx); | 1969 | ImplementErrorCon (pCtx); |
| 1971 | pCtx->iTotalNumMbRec = pCtx->pSps->iMbWidth * pCtx->pSps->iMbHeight; | 1970 | pCtx->iTotalNumMbRec = pCtx->pSps->iMbWidth * pCtx->pSps->iMbHeight; |
| 1971 | pCtx->pDec->iSpsId = pCtx->pSps->iSpsId; | ||
| 1972 | pCtx->pDec->iPpsId = pCtx->pPps->iPpsId; | ||
| 1972 | } | 1973 | } |
| 1973 | } | 1974 | } |
| 1974 | 1975 | ||
| @@ -2012,6 +2013,9 @@ bool CheckAndFinishLastPic (PWelsDecoderContext pCtx, uint8_t** ppDst, SBufferIn · 37 unmodified lines | |||
| 2012 | if (pCtx->eErrorConMethod != ERROR_CON_DISABLE) { | 2013 | if (pCtx->eErrorConMethod != ERROR_CON_DISABLE) { |
| 2013 | ImplementErrorCon (pCtx); | 2014 | ImplementErrorCon (pCtx); |
| 2014 | pCtx->iTotalNumMbRec = pCtx->pSps->iMbWidth * pCtx->pSps->iMbHeight; | 2015 | pCtx->iTotalNumMbRec = pCtx->pSps->iMbWidth * pCtx->pSps->iMbHeight; |
| 2016 | pCtx->pDec->iSpsId = pCtx->pSps->iSpsId; | ||
| 2017 | pCtx->pDec->iPpsId = pCtx->pPps->iPpsId; | ||
| 2018 | |||
| 2015 | DecodeFrameConstruction (pCtx, ppDst, pDstInfo); | 2019 | DecodeFrameConstruction (pCtx, ppDst, pDstInfo); |
| 2016 | if (pCtx->sLastNalHdrExt.sNalUnitHeader.uiNalRefIdc > 0) { | 2020 | if (pCtx->sLastNalHdrExt.sNalUnitHeader.uiNalRefIdc > 0) { |
| 2017 | pCtx->pPreviousDecodedPictureInDpb = pCtx->pDec; //save ECed pic for future use | 2021 | pCtx->pPreviousDecodedPictureInDpb = pCtx->pDec; //save ECed pic for future use |