History

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

Ganapathy Raman Kasi committed 9 years ago

Commit a5492431 parent b27be561 file · +3 −10Browse files

Unified · Split

libavcodec/nvenc.c+3−10
@@ -589,16 +589,6 @@ static void nvenc_override_rate_control(AVCodecContext *avctx) · 588 unmodified lines
589589 }
590590 set_constqp(avctx);
591591 return;
592− case NV_ENC_PARAMS_RC_2_PASS_VBR:
593− case NV_ENC_PARAMS_RC_VBR:
594− if (avctx->qmin < 0 && avctx->qmax < 0) {
595− av_log(avctx, AV_LOG_WARNING,
596− "The variable bitrate rate-control requires "
597− "the 'qmin' and/or 'qmax' option set.\n");
598− set_vbr(avctx);
599− return;
600− }
601− /* fall through */
602592 case NV_ENC_PARAMS_RC_VBR_MINQP:
603593 if (avctx->qmin < 0) {
604594 av_log(avctx, AV_LOG_WARNING,
@@ -607,6 +597,9 @@ static void nvenc_override_rate_control(AVCodecContext *avctx) · 2 unmodified lines
607597 set_vbr(avctx);
608598 return;
609599 }
600+ /* fall through */
601+ case NV_ENC_PARAMS_RC_2_PASS_VBR:
602+ case NV_ENC_PARAMS_RC_VBR:
610603 set_vbr(avctx);
611604 break;
612605 case NV_ENC_PARAMS_RC_CBR:

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t