Showing the changes to codec/decoder/core/src/decoder.cpp (1 of 10 files). Show all
Unified · Split
| @@ -310,7 +310,6 @@ void WelsDecoderDefaults (PWelsDecoderContext pCtx, SLogContext* pLogCtx) { · 309 unmodified lines | |||
| 310 | pCtx->pPicBuff[LIST_1] = NULL; | 310 | pCtx->pPicBuff[LIST_1] = NULL; |
| 311 | 311 | ||
| 312 | pCtx->bAvcBasedFlag = true; | 312 | pCtx->bAvcBasedFlag = true; |
| 313 | pCtx->eErrorConMethod = ERROR_CON_SLICE_MV_COPY_CROSS_IDR_FREEZE_RES_CHANGE; | ||
| 314 | pCtx->pPreviousDecodedPictureInDpb = NULL; | 313 | pCtx->pPreviousDecodedPictureInDpb = NULL; |
| 315 | pCtx->sDecoderStatistics.iAvgLumaQp = -1; | 314 | pCtx->sDecoderStatistics.iAvgLumaQp = -1; |
| 316 | pCtx->bSpsLatePps = false; | 315 | pCtx->bSpsLatePps = false; |
| @@ -534,10 +533,9 @@ int32_t DecoderConfigParam (PWelsDecoderContext pCtx, const SDecodingParam* kpPa · 217 unmodified lines | |||
| 534 | ERROR_CON_SLICE_MV_COPY_CROSS_IDR_FREEZE_RES_CHANGE); | 533 | ERROR_CON_SLICE_MV_COPY_CROSS_IDR_FREEZE_RES_CHANGE); |
| 535 | pCtx->pParam->eEcActiveIdc = ERROR_CON_SLICE_MV_COPY_CROSS_IDR_FREEZE_RES_CHANGE; | 534 | pCtx->pParam->eEcActiveIdc = ERROR_CON_SLICE_MV_COPY_CROSS_IDR_FREEZE_RES_CHANGE; |
| 536 | } | 535 | } |
| 537 | pCtx->eErrorConMethod = pCtx->pParam->eEcActiveIdc; | ||
| 538 | 536 | ||
| 539 | if (pCtx->pParam->bParseOnly) //parse only, disable EC method | 537 | if (pCtx->pParam->bParseOnly) //parse only, disable EC method |
| 540 | pCtx->eErrorConMethod = ERROR_CON_DISABLE; | 538 | pCtx->pParam->eEcActiveIdc = ERROR_CON_DISABLE; |
| 541 | InitErrorCon (pCtx); | 539 | InitErrorCon (pCtx); |
| 542 | 540 | ||
| 543 | if (VIDEO_BITSTREAM_SVC == pCtx->pParam->sVideoProperty.eVideoBsType || | 541 | if (VIDEO_BITSTREAM_SVC == pCtx->pParam->sVideoProperty.eVideoBsType || |