diff options
| author | Timo Rothenpieler <timo@rothenpieler.org> | 2020-10-21 18:45:52 +0200 |
|---|---|---|
| committer | Timo Rothenpieler <timo@rothenpieler.org> | 2020-10-21 18:45:52 +0200 |
| commit | e0c8e517b6a0d82d8837f78425b62132443ecf15 (patch) | |
| tree | d1ae4598172181deacdb439804e6dd0366831382 | |
| parent | cde3c080338154cc73103939f6ab26ae5bb718cd (diff) | |
| download | ffmpeg-e0c8e517b6a0d82d8837f78425b62132443ecf15.tar.gz | |
avcodec/nvenc: reduce automated use of deprecated modes
| -rw-r--r-- | libavcodec/nvenc.c | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index 837810d3d2..f560947ceb 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -903,10 +903,22 @@ static av_cold void nvenc_setup_rate_control(AVCodecContext *avctx) #ifdef NVENC_HAVE_MULTIPASS ctx->encode_config.rcParams.multiPass = ctx->multipass; - if (ctx->encode_config.rcParams.multiPass != NV_ENC_MULTI_PASS_DISABLED) - ctx->flags |= NVENC_TWO_PASSES; -#endif + if (ctx->flags & NVENC_ONE_PASS) + ctx->encode_config.rcParams.multiPass = NV_ENC_MULTI_PASS_DISABLED; + if (ctx->flags & NVENC_TWO_PASSES || ctx->twopass) + ctx->encode_config.rcParams.multiPass = NV_ENC_TWO_PASS_FULL_RESOLUTION; + + if (ctx->rc < 0) { + if (ctx->cbr) { + ctx->rc = NV_ENC_PARAMS_RC_CBR; + } else if (ctx->cqp >= 0) { + ctx->rc = NV_ENC_PARAMS_RC_CONSTQP; + } else { + ctx->rc = NV_ENC_PARAMS_RC_VBR; + } + } +#else if (ctx->rc < 0) { if (ctx->flags & NVENC_ONE_PASS) ctx->twopass = 0; @@ -930,6 +942,7 @@ static av_cold void nvenc_setup_rate_control(AVCodecContext *avctx) ctx->rc = NV_ENC_PARAMS_RC_VBR_MINQP; } } +#endif if (ctx->rc >= 0 && ctx->rc & RC_MODE_DEPRECATED) { av_log(avctx, AV_LOG_WARNING, "Specified rc mode is deprecated.\n"); @@ -1259,6 +1272,9 @@ static av_cold int nvenc_setup_encoder(AVCodecContext *avctx) #ifdef NVENC_HAVE_NEW_PRESETS ctx->init_encode_params.tuningInfo = ctx->tuning_info; + if (ctx->flags & NVENC_LOWLATENCY) + ctx->init_encode_params.tuningInfo = NV_ENC_TUNING_INFO_LOW_LATENCY; + nv_status = p_nvenc->nvEncGetEncodePresetConfigEx(ctx->nvencoder, ctx->init_encode_params.encodeGUID, ctx->init_encode_params.presetGUID, |