History

remove duplipate eErrorConMethod in decContext compared with pParam"

huili2 committed 9 years ago

Commit d5e304f1 parent 61b9ddc10 files · +69 −66Browse files

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

Unified · Split

codec/decoder/core/src/decoder.cpp+1−3
@@ -310,7 +310,6 @@ void WelsDecoderDefaults (PWelsDecoderContext pCtx, SLogContext* pLogCtx) { · 309 unmodified lines
310310 pCtx->pPicBuff[LIST_1] = NULL;
311311
312312 pCtx->bAvcBasedFlag = true;
313− pCtx->eErrorConMethod = ERROR_CON_SLICE_MV_COPY_CROSS_IDR_FREEZE_RES_CHANGE;
314313 pCtx->pPreviousDecodedPictureInDpb = NULL;
315314 pCtx->sDecoderStatistics.iAvgLumaQp = -1;
316315 pCtx->bSpsLatePps = false;
@@ -534,10 +533,9 @@ int32_t DecoderConfigParam (PWelsDecoderContext pCtx, const SDecodingParam* kpPa · 217 unmodified lines
534533 ERROR_CON_SLICE_MV_COPY_CROSS_IDR_FREEZE_RES_CHANGE);
535534 pCtx->pParam->eEcActiveIdc = ERROR_CON_SLICE_MV_COPY_CROSS_IDR_FREEZE_RES_CHANGE;
536535 }
537− pCtx->eErrorConMethod = pCtx->pParam->eEcActiveIdc;
538536
539537 if (pCtx->pParam->bParseOnly) //parse only, disable EC method
540− pCtx->eErrorConMethod = ERROR_CON_DISABLE;
538+ pCtx->pParam->eEcActiveIdc = ERROR_CON_DISABLE;
541539 InitErrorCon (pCtx);
542540
543541 if (VIDEO_BITSTREAM_SVC == pCtx->pParam->sVideoProperty.eVideoBsType ||

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