> From: Agatha Hu <a...@nvidia.com>
>
> ---
> libavcodec/nvenc.c | 22 +++++++++++++++-------
> 1 file changed, 15 insertions(+), 7 deletions(-)
>
> diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c
> index 812b0b4..17d58fc 100644
> --- a/libavcodec/nvenc.c
> +++ b/libavcodec/nvenc.c
> @@ -769,8 +769,11 @@ static av_cold int nvenc_encode_init(AVCodecContext
> *avctx)
> if (avctx->bit_rate > 0)
> ctx->encode_config.rcParams.averageBitRate = avctx->bit_rate;
>
> - if (avctx->rc_max_rate > 0)
> + if (avctx->rc_max_rate > 0) {
> ctx->encode_config.rcParams.maxBitRate = avctx->rc_max_rate;
> + } else if (ctx->encode_config.rcParams.averageBitRate > 0) {
> + ctx->encode_config.rcParams.maxBitRate =
> ctx->encode_config.rcParams.averageBitRate;
> + }
>
> if (lossless) {
> if (avctx->codec->id == AV_CODEC_ID_H264)
> @@ -850,8 +853,11 @@ static av_cold int nvenc_encode_init(AVCodecContext
> *avctx)
> }
> }
>
> - if (avctx->rc_buffer_size > 0)
> + if (avctx->rc_buffer_size > 0) {
> ctx->encode_config.rcParams.vbvBufferSize = avctx->rc_buffer_size;
> + } else if (ctx->encode_config.rcParams.averageBitRate > 0) {
> + ctx->encode_config.rcParams.vbvBufferSize = 2 *
> ctx->encode_config.rcParams.averageBitRate;
> + }
>
> if (avctx->flags & AV_CODEC_FLAG_INTERLACED_DCT) {
> ctx->encode_config.frameFieldMode =
> NV_ENC_PARAMS_FRAME_FIELD_MODE_FIELD;
> @@ -1457,10 +1463,10 @@ static const enum AVPixelFormat pix_fmts_nvenc[]
> = {
> #define OFFSET(x) offsetof(NvencContext, x)
> #define VE AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM
> static const AVOption options[] = {
> - { "preset", "Set the encoding preset (one of slow = hq 2pass,
> medium = hq, fast = hp, hq, hp, bd, ll, llhq, llhp, default)",
> OFFSET(preset), AV_OPT_TYPE_STRING, { .str = "hq" }, 0, 0, VE },
> - { "profile", "Set the encoding profile (high, main, baseline or
> high444p)", OFFSET(profile), AV_OPT_TYPE_STRING, { 0 }, 0, 0, VE },
> - { "level", "Set the encoding level restriction (auto, 1.0, 1.0b,
> 1.1, 1.2, ..., 4.2, 5.0, 5.1)", OFFSET(level), AV_OPT_TYPE_STRING, { 0
> }, 0, 0, VE },
> - { "tier", "Set the encoding tier (main or high)", OFFSET(tier),
> AV_OPT_TYPE_STRING, { 0 }, 0, 0, VE },
> + { "preset", "Set the encoding preset (one of slow = hq 2pass,
> medium = hq, fast = hp, hq, hp, bd, ll, llhq, llhp, default)",
> OFFSET(preset), AV_OPT_TYPE_STRING, { .str = "medium" }, 0, 0, VE },
> + { "profile", "Set the encoding profile (high, main, baseline or
> high444p)", OFFSET(profile), AV_OPT_TYPE_STRING, { .str = "main" }, 0,
> 0, VE },
> + { "level", "Set the encoding level restriction (auto, 1.0, 1.0b,
> 1.1, 1.2, ..., 4.2, 5.0, 5.1)", OFFSET(level), AV_OPT_TYPE_STRING, {
> .str = "auto" }, 0, 0, VE },
> + { "tier", "Set the encoding tier (main or high)", OFFSET(tier),
> AV_OPT_TYPE_STRING, { .str = "main" }, 0, 0, VE },
> { "cbr", "Use cbr encoding mode", OFFSET(cbr), AV_OPT_TYPE_BOOL, {
> .i64 = 0 }, 0, 1, VE },
> { "2pass", "Use 2pass encoding mode", OFFSET(twopass),
> AV_OPT_TYPE_BOOL, { .i64 = -1 }, -1, 1, VE },
> { "gpu", "Selects which NVENC capable GPU to use. First GPU is 0,
> second is 1, and so on.", OFFSET(gpu), AV_OPT_TYPE_INT, { .i64 = 0 }, 0,
> INT_MAX, VE },
> @@ -1469,12 +1475,14 @@ static const AVOption options[] = {
> };
>
> static const AVCodecDefault nvenc_defaults[] = {
> - { "b", "0" },
> + { "b", "2M" },
> { "qmin", "-1" },
> { "qmax", "-1" },
> { "qdiff", "-1" },
> { "qblur", "-1" },
> { "qcomp", "-1" },
> + {"g", "250"},
> + {"bf", "0"},
> { NULL },
> };
>
applied, thanks.
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
