Commit a549243b authored by Ganapathy Raman Kasi's avatar Ganapathy Raman Kasi Committed by Timo Rothenpieler

avcodec/nvenc: remove qmin and qmax constraints for vbr

qmin and qmax are not necessary for nvenc vbr.
Enforcing this constraint, doesn't allow user to use vbr 2 pass mode without explicity setting the qmin and qmax options
Signed-off-by: 's avatarTimo Rothenpieler <timo@rothenpieler.org>
parent b27be563
...@@ -589,16 +589,6 @@ static void nvenc_override_rate_control(AVCodecContext *avctx) ...@@ -589,16 +589,6 @@ static void nvenc_override_rate_control(AVCodecContext *avctx)
} }
set_constqp(avctx); set_constqp(avctx);
return; return;
case NV_ENC_PARAMS_RC_2_PASS_VBR:
case NV_ENC_PARAMS_RC_VBR:
if (avctx->qmin < 0 && avctx->qmax < 0) {
av_log(avctx, AV_LOG_WARNING,
"The variable bitrate rate-control requires "
"the 'qmin' and/or 'qmax' option set.\n");
set_vbr(avctx);
return;
}
/* fall through */
case NV_ENC_PARAMS_RC_VBR_MINQP: case NV_ENC_PARAMS_RC_VBR_MINQP:
if (avctx->qmin < 0) { if (avctx->qmin < 0) {
av_log(avctx, AV_LOG_WARNING, av_log(avctx, AV_LOG_WARNING,
...@@ -607,6 +597,9 @@ static void nvenc_override_rate_control(AVCodecContext *avctx) ...@@ -607,6 +597,9 @@ static void nvenc_override_rate_control(AVCodecContext *avctx)
set_vbr(avctx); set_vbr(avctx);
return; return;
} }
/* fall through */
case NV_ENC_PARAMS_RC_2_PASS_VBR:
case NV_ENC_PARAMS_RC_VBR:
set_vbr(avctx); set_vbr(avctx);
break; break;
case NV_ENC_PARAMS_RC_CBR: case NV_ENC_PARAMS_RC_CBR:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment