Showing the changes to codec/decoder/core/src/decoder.cpp (1 of 13 files). Show all
Unified · Split
| @@ -50,6 +50,7 @@ · 49 unmodified lines | |||
| 50 | #include "deblocking.h" | 50 | #include "deblocking.h" |
| 51 | #include "expand_pic.h" | 51 | #include "expand_pic.h" |
| 52 | #include "decode_slice.h" | 52 | #include "decode_slice.h" |
| 53 | #include "error_concealment.h" | ||
| 53 | #include "mem_align.h" | 54 | #include "mem_align.h" |
| 54 | #include "ls_defines.h" | 55 | #include "ls_defines.h" |
| 55 | 56 | ||
| @@ -476,6 +477,8 @@ int32_t WelsDecodeBs (PWelsDecoderContext pCtx, const uint8_t* kpBsBuf, const in · 420 unmodified lines | |||
| 476 | return pCtx->iErrorCode; | 477 | return pCtx->iErrorCode; |
| 477 | } | 478 | } |
| 478 | } | 479 | } |
| 480 | //Do error concealment here | ||
| 481 | ImplementErrorCon (pCtx); | ||
| 479 | } | 482 | } |
| 480 | 483 | ||
| 481 | if ((IS_PARAM_SETS_NALS (pCtx->sCurNalHead.eNalUnitType) || IS_SEI_NAL (pCtx->sCurNalHead.eNalUnitType)) && | 484 | if ((IS_PARAM_SETS_NALS (pCtx->sCurNalHead.eNalUnitType) || IS_SEI_NAL (pCtx->sCurNalHead.eNalUnitType)) && |
| @@ -530,10 +533,10 @@ int32_t WelsDecodeBs (PWelsDecoderContext pCtx, const uint8_t* kpBsBuf, const in · 48 unmodified lines | |||
| 530 | ResetParameterSetsState (pCtx); | 533 | ResetParameterSetsState (pCtx); |
| 531 | return pCtx->iErrorCode; | 534 | return pCtx->iErrorCode; |
| 532 | } | 535 | } |
| 536 | //Do error concealment here | ||
| 537 | ImplementErrorCon (pCtx); | ||
| 533 | } | 538 | } |
| 534 | 539 | ||
| 535 | //TODO error concealment here | ||
| 536 | |||
| 537 | if ((IS_PARAM_SETS_NALS (pCtx->sCurNalHead.eNalUnitType) || IS_SEI_NAL (pCtx->sCurNalHead.eNalUnitType)) | 540 | if ((IS_PARAM_SETS_NALS (pCtx->sCurNalHead.eNalUnitType) || IS_SEI_NAL (pCtx->sCurNalHead.eNalUnitType)) |
| 538 | && pNalPayload) { | 541 | && pNalPayload) { |
| 539 | if (ParseNonVclNal (pCtx, pNalPayload, iDstIdx - iConsumedBytes)) { | 542 | if (ParseNonVclNal (pCtx, pNalPayload, iDstIdx - iConsumedBytes)) { |
| @@ -571,7 +574,8 @@ int32_t WelsDecodeBs (PWelsDecoderContext pCtx, const uint8_t* kpBsBuf, const in · 31 unmodified lines | |||
| 571 | ResetParameterSetsState (pCtx); | 574 | ResetParameterSetsState (pCtx); |
| 572 | return pCtx->iErrorCode; | 575 | return pCtx->iErrorCode; |
| 573 | } | 576 | } |
| 574 | 577 | //Do error concealment here | |
| 578 | ImplementErrorCon (pCtx); | ||
| 575 | } | 579 | } |
| 576 | } | 580 | } |
| 577 | 581 | ||