aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJun Zhao <mypopydev@gmail.com>2017-08-25 15:56:51 +0800
committerMark Thompson <sw@jkqxz.net>2017-08-28 11:47:55 +0100
commit385cafb07ac1e46433931ea9749a134efd7350be (patch)
tree944968bb4e314c8a6d15fa10038f68498dafb1a2
parentef0c6d9b01de773e5a1177de5fcbb981aac44d65 (diff)
downloadffmpeg-385cafb07ac1e46433931ea9749a134efd7350be.tar.gz
lavc/vaapi_encode_h265: Enable VBR mode
Follow vaapi_h264 style, enable the VBR mode. Signed-off-by: Jun Zhao <jun.zhao@intel.com> Signed-off-by: Mark Thompson <sw@jkqxz.net>
-rw-r--r--libavcodec/vaapi_encode_h265.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/libavcodec/vaapi_encode_h265.c b/libavcodec/vaapi_encode_h265.c
index cf6b9388d1..971458db87 100644
--- a/libavcodec/vaapi_encode_h265.c
+++ b/libavcodec/vaapi_encode_h265.c
@@ -1185,13 +1185,15 @@ static av_cold int vaapi_encode_h265_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 = 30;
priv->fixed_qp_p = 30;
priv->fixed_qp_b = 30;
- 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_h265_init(AVCodecContext *avctx)
}
ctx->va_entrypoint = VAEntrypointEncSlice;
- 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 =