highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/nvenc: remove qmin and qmax constraints for vbr

Browse Source 
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: Timo Rothenpieler <timo@rothenpieler.org>
This commit is contained in:
Ganapathy Raman Kasi
2017-02-24 01:42:27 +00:00
committed by Timo Rothenpieler
parent b27be563a8
commit a549243b89
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libavcodec/nvenc.c
View File

@@ -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)
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: