generic-library/openh264
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Respect the bEnableRc field in SEncParamExt

Browse Source
This commit is contained in:
Martin Storsjö 2014-02-18 12:03:23 +02:00
parent f432ddeea8
commit b6502a5406
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
codec/encoder/core/inc/param_svc.h
View File

@ -275,7 +275,7 @@ int32_t ParamBaseTranscode (const SEncParamBase& pCodingParam, const bool kbEnab
return 0;
}
int32_t ParamTranscode (const SEncParamExt& pCodingParam, const bool kbEnableRc = true) {
int32_t ParamTranscode (const SEncParamExt& pCodingParam) {
float fParamMaxFrameRate = WELS_CLIP3 (pCodingParam.fMaxFrameRate, MIN_FRAME_RATE, MAX_FRAME_RATE);
iInputCsp = pCodingParam.iInputCsp; // color space of input sequence
@ -305,7 +305,7 @@ int32_t ParamTranscode (const SEncParamExt& pCodingParam, const bool kbEnableRc
bEnableFrameCroppingFlag = true;
/* Rate Control */
bEnableRc = kbEnableRc;
bEnableRc = pCodingParam.bEnableRc;
if (pCodingParam.iRCMode != RC_MODE0 && pCodingParam.iRCMode != RC_MODE1)
iRCMode = RC_MODE1;
else

4
codec/encoder/plus/src/welsEncoderExt.cpp
View File

@ -222,7 +222,7 @@ int CWelsH264SVCEncoder::Initialize (const SEncParamBase* argv, const INIT_TYPE
else if(iInitType == INIT_TYPE_PARAMETER_EXT)
{
// Convert SEncParamExt into WelsSVCParamConfig here..
if (sConfig.ParamTranscode (*(const SEncParamExt*)argv, true)) {
if (sConfig.ParamTranscode (*(const SEncParamExt*)argv)) {
WelsLog (m_pEncContext, WELS_LOG_ERROR, "CWelsH264SVCEncoder::Initialize(), parameter_translation failed.\n");
Uninitialize();
return cmInitParaError;
@ -785,7 +785,7 @@ int CWelsH264SVCEncoder::SetOption (ENCODER_OPTION eOptionId, void* pOption) {
}
iInputColorspace = sEncodingParam.iInputCsp;
if (sConfig.ParamTranscode (sEncodingParam, true)) {
if (sConfig.ParamTranscode (sEncodingParam)) {
return cmInitParaError;
}
if (sConfig.iSpatialLayerNum < 1) {