Merge pull request #1029 from ruil2/update_param

fix update parameters
This commit is contained in:
huili2 2014-06-28 11:05:54 +08:00
commit c8b4ef2257

View File

@ -3593,7 +3593,6 @@ int32_t WelsEncoderParamAdjust (sWelsEncCtx** ppCtx, SWelsSvcCodingParam* pNewPa
(pOldParam->bEnableLongTermReference != pNewParam->bEnableLongTermReference) || (pOldParam->bEnableLongTermReference != pNewParam->bEnableLongTermReference) ||
(pOldParam->iLTRRefNum != pNewParam->iLTRRefNum); (pOldParam->iLTRRefNum != pNewParam->iLTRRefNum);
if (pNewParam->iMaxNumRefFrame > pOldParam->iMaxNumRefFrame) { if (pNewParam->iMaxNumRefFrame > pOldParam->iMaxNumRefFrame) {
pNewParam->iMaxNumRefFrame = pOldParam->iMaxNumRefFrame;
bNeedReset = true; bNeedReset = true;
} }
@ -3676,7 +3675,9 @@ int32_t WelsEncoderParamAdjust (sWelsEncCtx** ppCtx, SWelsSvcCodingParam* pNewPa
pOldParam->bEnableSpsPpsIdAddition = pNewParam->bEnableSpsPpsIdAddition; pOldParam->bEnableSpsPpsIdAddition = pNewParam->bEnableSpsPpsIdAddition;
pOldParam->bPrefixNalAddingCtrl = pNewParam->bPrefixNalAddingCtrl; pOldParam->bPrefixNalAddingCtrl = pNewParam->bPrefixNalAddingCtrl;
pOldParam->iNumRefFrame = pNewParam->iNumRefFrame; // number of reference frame used pOldParam->iNumRefFrame = pNewParam->iNumRefFrame; // number of reference frame used
pOldParam->uiGopSize = pNewParam->uiGopSize;
pOldParam->iTemporalLayerNum = pNewParam->iTemporalLayerNum;
pOldParam->iDecompStages = pNewParam->iDecompStages;
/* denoise control */ /* denoise control */
pOldParam->bEnableDenoise = pNewParam->bEnableDenoise; pOldParam->bEnableDenoise = pNewParam->bEnableDenoise;