Showing the changes to codec/decoder/core/src/error_concealment.cpp (1 of 7 files). Show all
Unified · Split
| @@ -41,7 +41,8 @@ · 40 unmodified lines | |||
| 41 | namespace WelsDec { | 41 | namespace WelsDec { |
| 42 | //Init | 42 | //Init |
| 43 | void InitErrorCon (PWelsDecoderContext pCtx) { | 43 | void InitErrorCon (PWelsDecoderContext pCtx) { |
| 44 | if ((pCtx->eErrorConMethod == ERROR_CON_SLICE_COPY) || (pCtx->eErrorConMethod == ERROR_CON_SLICE_COPY_CROSS_IDR)) { | 44 | if ((pCtx->eErrorConMethod == ERROR_CON_SLICE_COPY) || (pCtx->eErrorConMethod == ERROR_CON_SLICE_COPY_CROSS_IDR) |
| 45 | || (pCtx->eErrorConMethod == ERROR_CON_SLICE_COPY_CROSS_IDR_FREEZE_RES_CHANGE)) { | ||
| 45 | pCtx->sCopyFunc.pCopyLumaFunc = WelsCopy16x16_c; | 46 | pCtx->sCopyFunc.pCopyLumaFunc = WelsCopy16x16_c; |
| 46 | pCtx->sCopyFunc.pCopyChromaFunc = WelsCopy8x8_c; | 47 | pCtx->sCopyFunc.pCopyChromaFunc = WelsCopy8x8_c; |
| 47 | 48 | ||
| @@ -196,7 +197,8 @@ void ImplementErrorCon (PWelsDecoderContext pCtx) { · 148 unmodified lines | |||
| 196 | || (ERROR_CON_FRAME_COPY_CROSS_IDR == pCtx->eErrorConMethod)) { | 197 | || (ERROR_CON_FRAME_COPY_CROSS_IDR == pCtx->eErrorConMethod)) { |
| 197 | DoErrorConFrameCopy (pCtx); | 198 | DoErrorConFrameCopy (pCtx); |
| 198 | } else if ((ERROR_CON_SLICE_COPY == pCtx->eErrorConMethod) | 199 | } else if ((ERROR_CON_SLICE_COPY == pCtx->eErrorConMethod) |
| 199 | || (ERROR_CON_SLICE_COPY_CROSS_IDR == pCtx->eErrorConMethod)) { | 200 | || (ERROR_CON_SLICE_COPY_CROSS_IDR == pCtx->eErrorConMethod) |
| 201 | || (ERROR_CON_SLICE_COPY_CROSS_IDR_FREEZE_RES_CHANGE == pCtx->eErrorConMethod)) { | ||
| 200 | DoErrorConSliceCopy (pCtx); | 202 | DoErrorConSliceCopy (pCtx); |
| 201 | } //TODO add other EC methods here in the future | 203 | } //TODO add other EC methods here in the future |
| 202 | pCtx->iErrorCode |= dsDataErrorConcealed; | 204 | pCtx->iErrorCode |= dsDataErrorConcealed; |