aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Degawa <christopher.degawa@intel.com>2022-10-20 22:55:28 -0500
committerJames Almer <jamrial@gmail.com>2022-11-17 20:27:33 -0300
commit1c6fd7d756afe0f8b7df14dbf7a95df275f8f5ee (patch)
tree7ebabe49a76cef94b60987b6100c17da94ace14c
parent031f1561cd286596cdb374da32f8aa816ce3b135 (diff)
downloadffmpeg-1c6fd7d756afe0f8b7df14dbf7a95df275f8f5ee.tar.gz
avcodec/libsvtav1: replace vbv_bufsize with maximum_buffer_size_ms
svt-av1 v1.2.0 has deprecated vbv_bufsize in favor of using - maximum_buffer_size_ms (--buf-sz) - starting_buffer_level_ms (--buf-initial-sz) - optimal_buffer_level_ms (--buf-optimal-sz) and vbv_bufsize has not been in use since svt-av1 v0.8.6 Signed-off-by: Christopher Degawa <christopher.degawa@intel.com>
-rw-r--r--libavcodec/libsvtav1.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/libsvtav1.c b/libavcodec/libsvtav1.c
index 28da206cf8..48cd58a0b3 100644
--- a/libavcodec/libsvtav1.c
+++ b/libavcodec/libsvtav1.c
@@ -179,7 +179,7 @@ static int config_enc_params(EbSvtAv1EncConfiguration *param,
param->min_qp_allowed = avctx->qmin;
}
param->max_bit_rate = avctx->rc_max_rate;
- param->vbv_bufsize = avctx->rc_buffer_size;
+ param->maximum_buffer_size_ms = avctx->rc_buffer_size * 1000LL / avctx->bit_rate;
if (svt_enc->crf > 0) {
param->qp = svt_enc->crf;
@@ -296,7 +296,7 @@ static int config_enc_params(EbSvtAv1EncConfiguration *param,
avctx->bit_rate = param->rate_control_mode > 0 ?
param->target_bit_rate : 0;
avctx->rc_max_rate = param->max_bit_rate;
- avctx->rc_buffer_size = param->vbv_bufsize;
+ avctx->rc_buffer_size = param->maximum_buffer_size_ms * avctx->bit_rate / 1000LL;
if (avctx->bit_rate || avctx->rc_max_rate || avctx->rc_buffer_size) {
AVCPBProperties *cpb_props = ff_add_cpb_side_data(avctx);