From 8c3db53fca51ac6bf67a8b9e8ca742f9cddafb59 Mon Sep 17 00:00:00 2001 From: Haibo Zhu Date: Mon, 29 Dec 2014 22:17:38 -0800 Subject: [PATCH] Change default EC mode to ERROR_CON_SLICE_MV_COPY_CROSS_IDR_FREEZE_RES_CHANGE --- codec/console/dec/src/h264dec.cpp | 2 +- codec/decoder/core/src/decoder.cpp | 2 +- module/gmp-openh264.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/codec/console/dec/src/h264dec.cpp b/codec/console/dec/src/h264dec.cpp index 4b4f8dff..414cc4c3 100644 --- a/codec/console/dec/src/h264dec.cpp +++ b/codec/console/dec/src/h264dec.cpp @@ -200,7 +200,7 @@ void H264DecodeInstance (ISVCDecoder* pDecoder, const char* kpH264FileName, cons pDecoder->GetOption (DECODER_OPTION_VCL_NAL, &iFeedbackVclNalInAu); int32_t iFeedbackTidInAu; pDecoder->GetOption (DECODER_OPTION_TEMPORAL_ID, &iFeedbackTidInAu); - int32_t iErrorConMethod = (int32_t) ERROR_CON_SLICE_COPY_CROSS_IDR_FREEZE_RES_CHANGE; + int32_t iErrorConMethod = (int32_t) ERROR_CON_SLICE_MV_COPY_CROSS_IDR_FREEZE_RES_CHANGE; pDecoder->SetOption (DECODER_OPTION_ERROR_CON_IDC, &iErrorConMethod); //~end for diff --git a/codec/decoder/core/src/decoder.cpp b/codec/decoder/core/src/decoder.cpp index 2b8b2b8f..39872341 100644 --- a/codec/decoder/core/src/decoder.cpp +++ b/codec/decoder/core/src/decoder.cpp @@ -306,7 +306,7 @@ void WelsDecoderDefaults (PWelsDecoderContext pCtx, SLogContext* pLogCtx) { pCtx->pPicBuff[LIST_1] = NULL; pCtx->bAvcBasedFlag = true; - pCtx->eErrorConMethod = ERROR_CON_SLICE_COPY_CROSS_IDR_FREEZE_RES_CHANGE; + pCtx->eErrorConMethod = ERROR_CON_SLICE_MV_COPY_CROSS_IDR_FREEZE_RES_CHANGE; pCtx->pPreviousDecodedPictureInDpb = NULL; pCtx->sDecoderStatistics.iAvgLumaQp = -1; diff --git a/module/gmp-openh264.cpp b/module/gmp-openh264.cpp index 9689067c..f9afbd58 100644 --- a/module/gmp-openh264.cpp +++ b/module/gmp-openh264.cpp @@ -589,7 +589,7 @@ class OpenH264VideoDecoder : public GMPVideoDecoder { memset (¶m, 0, sizeof (param)); param.eOutputColorFormat = videoFormatI420; param.uiTargetDqLayer = UCHAR_MAX; // Default value - param.eEcActiveIdc = ERROR_CON_SLICE_COPY; // Error concealment on. + param.eEcActiveIdc = ERROR_CON_SLICE_MV_COPY_CROSS_IDR_FREEZE_RES_CHANGE; // Error concealment on. param.sVideoProperty.eVideoBsType = VIDEO_BITSTREAM_DEFAULT; if (decoder_->Initialize (¶m)) {