ffmpeg | branch: master | Ben Chang <b...@nvidia.com> | Wed May 10 12:29:17 2017 +0530| [18a659d1b653c24de1a691c13f7db1b6e6a95aee] | committer: Timo Rothenpieler
avcodec/nvenc: add fractional CQ support Signed-off-by: Timo Rothenpieler <t...@rothenpieler.org> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=18a659d1b653c24de1a691c13f7db1b6e6a95aee --- libavcodec/nvenc.c | 7 ++++++- libavcodec/nvenc.h | 2 +- libavcodec/nvenc_h264.c | 2 +- libavcodec/nvenc_hevc.c | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/libavcodec/nvenc.c b/libavcodec/nvenc.c index b7723fe949..d6c1005625 100644 --- a/libavcodec/nvenc.c +++ b/libavcodec/nvenc.c @@ -796,7 +796,12 @@ static av_cold void nvenc_setup_rate_control(AVCodecContext *avctx) ctx->encode_config.rcParams.zeroReorderDelay = 1; if (ctx->quality) - ctx->encode_config.rcParams.targetQuality = ctx->quality; + { + //convert from float to fixed point 8.8 + int tmp_quality = (int)(ctx->quality * 256.0f); + ctx->encode_config.rcParams.targetQuality = (uint8_t)(tmp_quality >> 8); + ctx->encode_config.rcParams.targetQualityLSB = (uint8_t)(tmp_quality & 0xff); + } } static av_cold int nvenc_setup_h264_config(AVCodecContext *avctx) diff --git a/libavcodec/nvenc.h b/libavcodec/nvenc.h index 02066383b3..e60683711b 100644 --- a/libavcodec/nvenc.h +++ b/libavcodec/nvenc.h @@ -154,7 +154,7 @@ typedef struct NvencContext int nonref_p; int strict_gop; int aq_strength; - int quality; + float quality; int aud; int bluray_compat; int init_qp_p; diff --git a/libavcodec/nvenc_h264.c b/libavcodec/nvenc_h264.c index 232dd91289..595e882ed2 100644 --- a/libavcodec/nvenc_h264.c +++ b/libavcodec/nvenc_h264.c @@ -109,7 +109,7 @@ static const AVOption options[] = { { "aq-strength", "When Spatial AQ is enabled, this field is used to specify AQ strength. AQ strength scale is from 1 (low) - 15 (aggressive)", OFFSET(aq_strength), AV_OPT_TYPE_INT, { .i64 = 8 }, 1, 15, VE }, { "cq", "Set target quality level (0 to 51, 0 means automatic) for constant quality mode in VBR rate control", - OFFSET(quality), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 51, VE }, + OFFSET(quality), AV_OPT_TYPE_FLOAT, { .dbl = 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 }, diff --git a/libavcodec/nvenc_hevc.c b/libavcodec/nvenc_hevc.c index 346da372de..b5ce84a1d2 100644 --- a/libavcodec/nvenc_hevc.c +++ b/libavcodec/nvenc_hevc.c @@ -106,7 +106,7 @@ static const AVOption options[] = { { "aq-strength", "When Spatial AQ is enabled, this field is used to specify AQ strength. AQ strength scale is from 1 (low) - 15 (aggressive)", OFFSET(aq_strength), AV_OPT_TYPE_INT, { .i64 = 8 }, 1, 15, VE }, { "cq", "Set target quality level (0 to 51, 0 means automatic) for constant quality mode in VBR rate control", - OFFSET(quality), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 51, VE }, + OFFSET(quality), AV_OPT_TYPE_FLOAT, { .dbl = 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 }, _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
