Showing the changes to codec/encoder/core/src/encoder_ext.cpp (1 of 1 file). Show all
Unified · Split
| @@ -147,7 +147,8 @@ int32_t ParamValidation (SLogContext* pLogCtx, SWelsSvcCodingParam* pCfg) { · 146 unmodified lines | ||
| 147 | 147 | } |
| 148 | 148 | |
| 149 | 149 | |
| 150 | − if ((pCfg->iRCMode != RC_OFF_MODE) && (pCfg->iRCMode != RC_QUALITY_MODE) && (pCfg->iRCMode!= RC_BUFFERBASED_MODE)&&(pCfg->iRCMode != RC_BITRATE_MODE) | |
| 150 | + if ((pCfg->iRCMode != RC_OFF_MODE) && (pCfg->iRCMode != RC_QUALITY_MODE) && (pCfg->iRCMode != RC_BUFFERBASED_MODE) | |
| 151 | + && (pCfg->iRCMode != RC_BITRATE_MODE) | |
| 151 | 152 | && (pCfg->iRCMode != RC_LOW_BW_MODE)) { |
| 152 | 153 | WelsLog (pLogCtx, WELS_LOG_ERROR, "ParamValidation(),Invalid iRCMode = %d\n", pCfg->iRCMode); |
| 153 | 154 | return ENC_RETURN_UNSUPPORTED_PARA; |
| @@ -3594,7 +3595,8 @@ int32_t WelsEncoderEncodeExt (sWelsEncCtx* pCtx, SFrameBSInfo* pFbi, const SSour · 3440 unmodified lines | ||
| 3594 | 3595 | } |
| 3595 | 3596 | |
| 3596 | 3597 | #ifdef ENABLE_FRAME_DUMP |
| 3597 | − DumpRecFrame (fsnr, &pSvcParam->sDependencyLayers[pSvcParam->iSpatialLayerNum-1].sRecFileName[0], pCtx->bRecFlag); // pDecPic: final reconstruction output | |
| 3598 | + DumpRecFrame (fsnr, &pSvcParam->sDependencyLayers[pSvcParam->iSpatialLayerNum - 1].sRecFileName[0], | |
| 3599 | + pCtx->bRecFlag); // pDecPic: final reconstruction output | |
| 3598 | 3600 | pCtx->bRecFlag = true; |
| 3599 | 3601 | |
| 3600 | 3602 | #endif//ENABLE_FRAME_DUMP |
| @@ -3636,7 +3638,8 @@ int32_t WelsEncoderParamAdjust (sWelsEncCtx** ppCtx, SWelsSvcCodingParam* pNewPa · 35 unmodified lines | ||
| 3636 | 3638 | (pOldParam->SUsedPicRect.iWidth != pNewParam->SUsedPicRect.iWidth |
| 3637 | 3639 | || pOldParam->SUsedPicRect.iHeight != pNewParam->SUsedPicRect.iHeight) || |
| 3638 | 3640 | (pOldParam->bEnableLongTermReference != pNewParam->bEnableLongTermReference) || |
| 3639 | − (pOldParam->iLTRRefNum != pNewParam->iLTRRefNum); | |
| 3641 | + (pOldParam->iLTRRefNum != pNewParam->iLTRRefNum) || | |
| 3642 | + (pOldParam->iMultipleThreadIdc != pNewParam->iMultipleThreadIdc); | |
| 3640 | 3643 | if (pNewParam->iMaxNumRefFrame > pOldParam->iMaxNumRefFrame) { |
| 3641 | 3644 | bNeedReset = true; |
| 3642 | 3645 | } |