From 265249e4dbfcead02c111255bbcf1e2b8bbb8656 Mon Sep 17 00:00:00 2001 From: Konda Raju Date: Tue, 28 Feb 2017 11:09:12 +0530 Subject: [PATCH] add initial QP value options for nvenc --- libavcodec/nvenc.c | 33 +++++++++++++++++++++++++-------- libavcodec/nvenc.h | 3 +++ libavcodec/nvenc_h264.c | 3 +++ libavcodec/nvenc_hevc.c | 3 +++ 4 files changed, 34 insertions(+), 8 deletions(-) diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index ba2647b10a..158642a550 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -547,16 +547,33 @@ static av_cold void set_vbr(AVCodecContext *avctx) } rc->enableInitialRCQP = 1; - rc->initialRCQP.qpInterP = qp_inter_p; - if (avctx->i_quant_factor != 0.0 && avctx->b_quant_factor != 0.0) { - rc->initialRCQP.qpIntra = av_clip( - qp_inter_p * fabs(avctx->i_quant_factor) + avctx->i_quant_offset + 0.5, 0, 51); - rc->initialRCQP.qpInterB = av_clip( - qp_inter_p * fabs(avctx->b_quant_factor) + avctx->b_quant_offset + 0.5, 0, 51); + if (ctx->init_qp_p < 0) { + rc->initialRCQP.qpInterP = qp_inter_p; } else { - rc->initialRCQP.qpIntra = qp_inter_p; - rc->initialRCQP.qpInterB = qp_inter_p; + rc->initialRCQP.qpInterP = ctx->init_qp_p; + } + + if (ctx->init_qp_i < 0) { + if (avctx->i_quant_factor != 0.0 && avctx->b_quant_factor != 0.0) { + rc->initialRCQP.qpIntra = av_clip( + rc->initialRCQP.qpInterP * fabs(avctx->i_quant_factor) + avctx->i_quant_offset + 0.5, 0, 51); + } else { + rc->initialRCQP.qpIntra = rc->initialRCQP.qpInterP; + } + } else { + rc->initialRCQP.qpIntra = ctx->init_qp_i; + } + + if (ctx->init_qp_b < 0) { + if (avctx->i_quant_factor != 0.0 && avctx->b_quant_factor != 0.0) { + rc->initialRCQP.qpInterB = av_clip( + rc->initialRCQP.qpInterP * fabs(avctx->b_quant_factor) + avctx->b_quant_offset + 0.5, 0, 51); + } else { + rc->initialRCQP.qpInterB = rc->initialRCQP.qpInterP; + } + } else { + rc->initialRCQP.qpInterB = ctx->init_qp_b; } } diff --git a/libavcodec/nvenc.h b/libavcodec/nvenc.h index ab48cf759a..cfca2efcc5 100644 --- a/libavcodec/nvenc.h +++ b/libavcodec/nvenc.h @@ -155,6 +155,9 @@ typedef struct NvencContext int quality; int aud; int bluray_compat; + int init_qp_p; + int init_qp_b; + int init_qp_i; } NvencContext; int ff_nvenc_encode_init(AVCodecContext *avctx); diff --git a/libavcodec/nvenc_h264.c b/libavcodec/nvenc_h264.c index 3f71204afb..b7d4004fd3 100644 --- a/libavcodec/nvenc_h264.c +++ b/libavcodec/nvenc_h264.c @@ -109,6 +109,9 @@ static const AVOption options[] = { OFFSET(quality), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 51, VE }, { "aud", "Use access unit delimiters", OFFSET(aud), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, { "bluray-compat", "Bluray compatibility workarounds", OFFSET(bluray_compat),AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, + { "init_qpP", "Initial QP value for P frame", OFFSET(init_qp_p), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 51, VE }, + { "init_qpB", "Initial QP value for B frame", OFFSET(init_qp_b), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 51, VE }, + { "init_qpI", "Initial QP value for I frame", OFFSET(init_qp_i), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 51, VE }, { NULL } }; diff --git a/libavcodec/nvenc_hevc.c b/libavcodec/nvenc_hevc.c index 1c97fb0e45..2804d7df5a 100644 --- a/libavcodec/nvenc_hevc.c +++ b/libavcodec/nvenc_hevc.c @@ -106,6 +106,9 @@ static const AVOption options[] = { OFFSET(quality), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 51, VE }, { "aud", "Use access unit delimiters", OFFSET(aud), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, { "bluray-compat", "Bluray compatibility workarounds", OFFSET(bluray_compat),AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, + { "init_qpP", "Initial QP value for P frame", OFFSET(init_qp_p), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 51, VE }, + { "init_qpB", "Initial QP value for B frame", OFFSET(init_qp_b), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 51, VE }, + { "init_qpI", "Initial QP value for I frame", OFFSET(init_qp_i), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 51, VE }, { NULL } }; -- 2.11.0.windows.3