diff options
| author | Mark Thompson <sw@jkqxz.net> | 2017-01-29 14:12:20 +0000 |
|---|---|---|
| committer | Mark Thompson <sw@jkqxz.net> | 2017-02-08 19:14:05 +0000 |
| commit | 2201c02e6dc9f9652a8e27dec194915f05954ad0 (patch) | |
| tree | ce708fe850e01d887f36864322ccf8878dedbcb9 | |
| parent | ceb28c3cc4c7921935b48904db3c559eed1597fe (diff) | |
| download | ffmpeg-2201c02e6dc9f9652a8e27dec194915f05954ad0.tar.gz | |
vaapi_h264: Enable VBR mode
Default to using VBR when a target bitrate is set, unless the max rate
is also set and matches the target. Changes to the Intel driver mean
that min_qp is also respected in this case, so set a codec default to
unset the value rather than using the current default inherited from
the MPEG-4 part 2 encoder.
(cherry picked from commit eddfb57210298a0a94472794485400a3a6c76196)
| -rw-r--r-- | libavcodec/vaapi_encode_h264.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/libavcodec/vaapi_encode_h264.c b/libavcodec/vaapi_encode_h264.c index b980527917..92e29554ed 100644 --- a/libavcodec/vaapi_encode_h264.c +++ b/libavcodec/vaapi_encode_h264.c @@ -1126,13 +1126,15 @@ static av_cold int vaapi_encode_h264_configure(AVCodecContext *avctx) "%d / %d / %d for IDR- / P- / B-frames.\n", priv->fixed_qp_idr, priv->fixed_qp_p, priv->fixed_qp_b); - } else if (ctx->va_rc_mode == VA_RC_CBR) { + } else if (ctx->va_rc_mode == VA_RC_CBR || + ctx->va_rc_mode == VA_RC_VBR) { // These still need to be set for pic_init_qp/slice_qp_delta. priv->fixed_qp_idr = 26; priv->fixed_qp_p = 26; priv->fixed_qp_b = 26; - av_log(avctx, AV_LOG_DEBUG, "Using constant-bitrate = %"PRId64" bps.\n", + av_log(avctx, AV_LOG_DEBUG, "Using %s-bitrate = %"PRId64" bps.\n", + ctx->va_rc_mode == VA_RC_CBR ? "constant" : "variable", avctx->bit_rate); } else { @@ -1251,9 +1253,12 @@ static av_cold int vaapi_encode_h264_init(AVCodecContext *avctx) // Only 8-bit encode is supported. ctx->va_rt_format = VA_RT_FORMAT_YUV420; - if (avctx->bit_rate > 0) - ctx->va_rc_mode = VA_RC_CBR; - else + if (avctx->bit_rate > 0) { + if (avctx->rc_max_rate == avctx->bit_rate) + ctx->va_rc_mode = VA_RC_CBR; + else + ctx->va_rc_mode = VA_RC_VBR; + } else ctx->va_rc_mode = VA_RC_CQP; ctx->va_packed_headers = @@ -1291,6 +1296,7 @@ static const AVCodecDefault vaapi_encode_h264_defaults[] = { { "i_qoffset", "0" }, { "b_qfactor", "6/5" }, { "b_qoffset", "0" }, + { "qmin", "0" }, { NULL }, }; |