RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

nvenc: Remove qmin and qmax constraints for nvenc vbr 

qmin and qmax are not necessary for nvenc vbr.

Also fix for using 2 pass vbr mode for slow preset through ctx->flag NVENC_TWO_PASSES.

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
This commit is contained in:
Ganapathy Kasi 2017-03-01 15:04:47 -08:00 committed by Luca Barbato
parent aba5b94859
commit 3303f86467
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libavcodec/nvenc.c
View File

@ -559,12 +559,8 @@ static void nvenc_override_rate_control(AVCodecContext *avctx,
return; return;
case NV_ENC_PARAMS_RC_2_PASS_VBR: case NV_ENC_PARAMS_RC_2_PASS_VBR:
case NV_ENC_PARAMS_RC_VBR: case NV_ENC_PARAMS_RC_VBR:
if (avctx->qmin < 0 && avctx->qmax < 0) { set_vbr(avctx, rc);
av_log(avctx, AV_LOG_WARNING, break;
"The variable bitrate rate-control requires "
"the 'qmin' and/or 'qmax' option set.\n");
return;
}
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,
@ -606,8 +602,11 @@ static void nvenc_setup_rate_control(AVCodecContext *avctx)
set_lossless(avctx, rc); set_lossless(avctx, rc);
} else if (avctx->global_quality > 0) { } else if (avctx->global_quality > 0) {
set_constqp(avctx, rc); set_constqp(avctx, rc);
} else if (avctx->qmin >= 0 && avctx->qmax >= 0) { } else {
rc->rateControlMode = NV_ENC_PARAMS_RC_VBR; if (ctx->flags & NVENC_TWO_PASSES)
rc->rateControlMode = NV_ENC_PARAMS_RC_2_PASS_VBR;
else
rc->rateControlMode = NV_ENC_PARAMS_RC_VBR;
set_vbr(avctx, rc); set_vbr(avctx, rc);
} }