History

divide copy_mb functions into new file for decoder use from encoder and add files for EC in decoder only.

huili2 committed 12 years ago

Commit 4ab8c881 parent 4b5a45513 files · +380 −86Browse files

Showing the changes to codec/decoder/core/src/decoder.cpp (1 of 13 files). Show all

Unified · Split

codec/decoder/core/src/decoder.cpp+7−3
@@ -50,6 +50,7 @@ · 49 unmodified lines
5050 #include "deblocking.h"
5151 #include "expand_pic.h"
5252 #include "decode_slice.h"
53+#include "error_concealment.h"
5354 #include "mem_align.h"
5455 #include "ls_defines.h"
5556
@@ -476,6 +477,8 @@ int32_t WelsDecodeBs (PWelsDecoderContext pCtx, const uint8_t* kpBsBuf, const in · 420 unmodified lines
476477 return pCtx->iErrorCode;
477478 }
478479 }
480+ //Do error concealment here
481+ ImplementErrorCon (pCtx);
479482 }
480483
481484 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
530533 ResetParameterSetsState (pCtx);
531534 return pCtx->iErrorCode;
532535 }
536+ //Do error concealment here
537+ ImplementErrorCon (pCtx);
533538 }
534539
535− //TODO error concealment here
536−
537540 if ((IS_PARAM_SETS_NALS (pCtx->sCurNalHead.eNalUnitType) || IS_SEI_NAL (pCtx->sCurNalHead.eNalUnitType))
538541 && pNalPayload) {
539542 if (ParseNonVclNal (pCtx, pNalPayload, iDstIdx - iConsumedBytes)) {
@@ -571,7 +574,8 @@ int32_t WelsDecodeBs (PWelsDecoderContext pCtx, const uint8_t* kpBsBuf, const in · 31 unmodified lines
571574 ResetParameterSetsState (pCtx);
572575 return pCtx->iErrorCode;
573576 }
574−
577+ //Do error concealment here
578+ ImplementErrorCon (pCtx);
575579 }
576580 }
577581

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t