shithub: openh264

Info  •  Files  •  Log  •  Branches

Merge pull request #1683 from HaiboZhu/Change_default_EC_mode

Change default EC mode

--- a/codec/console/dec/src/h264dec.cpp

+++ b/codec/console/dec/src/h264dec.cpp

@@ -200,7 +200,7 @@

     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

--- a/codec/decoder/core/src/decoder.cpp

+++ b/codec/decoder/core/src/decoder.cpp

@@ -306,7 +306,7 @@

   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;

   pCtx->bSpsLatePps = false;

--- a/module/gmp-openh264.cpp

+++ b/module/gmp-openh264.cpp

@@ -589,7 +589,7 @@

     memset (&param, 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 (&param)) {