From 9629701ce9debe295da09bb0e117ee9392ef1fe3 Mon Sep 17 00:00:00 2001 From: Mark Thompson Date: Tue, 12 Apr 2016 23:15:40 +0100 Subject: [PATCH] vaapi_h264: Add -qp option, use it to replace use of -global_quality Signed-off-by: Anton Khirnov --- libavcodec/vaapi_encode_h264.c | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/libavcodec/vaapi_encode_h264.c b/libavcodec/vaapi_encode_h264.c index df4c169911..940832e367 100644 --- a/libavcodec/vaapi_encode_h264.c +++ b/libavcodec/vaapi_encode_h264.c @@ -115,6 +115,10 @@ typedef struct VAAPIEncodeH264Context { } hrd_params; } VAAPIEncodeH264Context; +typedef struct VAAPIEncodeH264Options { + int qp; +} VAAPIEncodeH264Options; + #define vseq_var(name) vseq->name, name #define vseq_field(name) vseq->seq_fields.bits.name, name @@ -765,8 +769,9 @@ static av_cold int vaapi_encode_h264_init_fixed_qp(AVCodecContext *avctx) { VAAPIEncodeContext *ctx = avctx->priv_data; VAAPIEncodeH264Context *priv = ctx->priv_data; + VAAPIEncodeH264Options *opt = ctx->codec_options; - priv->fixed_qp_p = avctx->global_quality; + priv->fixed_qp_p = opt->qp; if (avctx->i_quant_factor > 0.0) priv->fixed_qp_idr = (int)((priv->fixed_qp_p * avctx->i_quant_factor + avctx->i_quant_offset) + 0.5); @@ -895,13 +900,21 @@ static av_cold int vaapi_encode_h264_init(AVCodecContext *avctx) return ff_vaapi_encode_init(avctx, &vaapi_encode_type_h264); } +#define OFFSET(x) (offsetof(VAAPIEncodeContext, codec_options_data) + \ + offsetof(VAAPIEncodeH264Options, x)) +#define FLAGS (AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_ENCODING_PARAM) +static const AVOption vaapi_encode_h264_options[] = { + { "qp", "Constant QP (for P frames; scaled by qfactor/qoffset for I/B)", + OFFSET(qp), AV_OPT_TYPE_INT, { .i64 = 20 }, 0, 52, FLAGS }, + { NULL }, +}; + static const AVCodecDefault vaapi_encode_h264_defaults[] = { { "profile", "100" }, { "level", "51" }, { "b", "0" }, { "bf", "2" }, { "g", "120" }, - { "global_quality", "20" }, { "i_qfactor", "1.0" }, { "i_qoffset", "0.0" }, { "b_qfactor", "1.2" }, @@ -912,6 +925,7 @@ static const AVCodecDefault vaapi_encode_h264_defaults[] = { static const AVClass vaapi_encode_h264_class = { .class_name = "h264_vaapi", .item_name = av_default_item_name, + .option = vaapi_encode_h264_options, .version = LIBAVUTIL_VERSION_INT, }; @@ -920,7 +934,8 @@ AVCodec ff_h264_vaapi_encoder = { .long_name = NULL_IF_CONFIG_SMALL("H.264/AVC (VAAPI)"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_H264, - .priv_data_size = sizeof(VAAPIEncodeContext), + .priv_data_size = (sizeof(VAAPIEncodeContext) + + sizeof(VAAPIEncodeH264Options)), .init = &vaapi_encode_h264_init, .encode2 = &ff_vaapi_encode2, .close = &ff_vaapi_encode_close,