Showing the changes to codec/encoder/core/src/encoder_ext.cpp (1 of 4 files). Show all
Unified · Split
| @@ -174,7 +174,7 @@ int32_t ParamValidation (SLogContext* pLogCtx, SWelsSvcCodingParam* pCfg) { · 173 unmodified lines | |||
| 174 | } | 174 | } |
| 175 | 175 | ||
| 176 | if ((pCfg->iRCMode != RC_OFF_MODE) && (pCfg->iRCMode != RC_QUALITY_MODE) && (pCfg->iRCMode != RC_BUFFERBASED_MODE) | 176 | if ((pCfg->iRCMode != RC_OFF_MODE) && (pCfg->iRCMode != RC_QUALITY_MODE) && (pCfg->iRCMode != RC_BUFFERBASED_MODE) |
| 177 | && (pCfg->iRCMode != RC_BITRATE_MODE)) { | 177 | && (pCfg->iRCMode != RC_BITRATE_MODE)&& (pCfg->iRCMode != RC_TIMESTAMP_MODE)) { |
| 178 | WelsLog (pLogCtx, WELS_LOG_ERROR, "ParamValidation(),Invalid iRCMode = %d", pCfg->iRCMode); | 178 | WelsLog (pLogCtx, WELS_LOG_ERROR, "ParamValidation(),Invalid iRCMode = %d", pCfg->iRCMode); |
| 179 | return ENC_RETURN_UNSUPPORTED_PARA; | 179 | return ENC_RETURN_UNSUPPORTED_PARA; |
| 180 | } | 180 | } |
| @@ -198,10 +198,10 @@ int32_t ParamValidation (SLogContext* pLogCtx, SWelsSvcCodingParam* pCfg) { · 17 unmodified lines | |||
| 198 | iTotalBitrate, pCfg->iTargetBitrate); | 198 | iTotalBitrate, pCfg->iTargetBitrate); |
| 199 | return ENC_RETURN_INVALIDINPUT; | 199 | return ENC_RETURN_INVALIDINPUT; |
| 200 | } | 200 | } |
| 201 | if ((pCfg->iRCMode == RC_QUALITY_MODE) || (pCfg->iRCMode == RC_BITRATE_MODE)) | 201 | if ((pCfg->iRCMode == RC_QUALITY_MODE) || (pCfg->iRCMode == RC_BITRATE_MODE) || (pCfg->iRCMode == RC_TIMESTAMP_MODE)) |
| 202 | if (!pCfg->bEnableFrameSkip) | 202 | if (!pCfg->bEnableFrameSkip) |
| 203 | WelsLog (pLogCtx, WELS_LOG_WARNING, | 203 | WelsLog (pLogCtx, WELS_LOG_WARNING, |
| 204 | "bEnableFrameSkip = %d,bitrate can't be controlled for RC_QUALITY_MODE and RC_BITRATE_MODE without enabling skip frame.", | 204 | "bEnableFrameSkip = %d,bitrate can't be controlled for RC_QUALITY_MODE,RC_BITRATE_MODE and RC_TIMESTAMP_MODE without enabling skip frame.", |
| 205 | pCfg->bEnableFrameSkip); | 205 | pCfg->bEnableFrameSkip); |
| 206 | } | 206 | } |
| 207 | return WelsCheckRefFrameLimitation (pLogCtx, pCfg); | 207 | return WelsCheckRefFrameLimitation (pLogCtx, pCfg); |