diff options
| author | Jan Ekström <jeebjp@gmail.com> | 2023-03-09 20:27:06 +0200 |
|---|---|---|
| committer | Timo Rothenpieler <timo@rothenpieler.org> | 2023-06-06 23:54:50 +0200 |
| commit | e5b5dd66535f444451e0fee59247b224d866f334 (patch) | |
| tree | b3a02c3bd90c733835a935fffddcca2f2c0efa0f | |
| parent | 8fe2fec45321d1b82f98f9725ad9118cefcfa58d (diff) | |
| download | ffmpeg-release/5.1.tar.gz | |
avcodec/libsvtav1: use larger of bit rate and max rate for buffer sizerelease/5.1
Generally if maxrate is set, the calculation should be maxrate over
bufsize. This additionally enables CRF + maxrate & bufsize usage.
In order to keep negative values from enabling zero to be treated
as larger and causing a division by zero, check that one of the
variables is larger than zero.
| -rw-r--r-- | libavcodec/libsvtav1.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libavcodec/libsvtav1.c b/libavcodec/libsvtav1.c index d41bed480b..0f9d455660 100644 --- a/libavcodec/libsvtav1.c +++ b/libavcodec/libsvtav1.c @@ -179,8 +179,10 @@ static int config_enc_params(EbSvtAv1EncConfiguration *param, param->min_qp_allowed = avctx->qmin; } param->max_bit_rate = avctx->rc_max_rate; - if (avctx->bit_rate && avctx->rc_buffer_size) - param->maximum_buffer_size_ms = avctx->rc_buffer_size * 1000LL / avctx->bit_rate; + if ((avctx->bit_rate > 0 || avctx->rc_max_rate > 0) && avctx->rc_buffer_size) + param->maximum_buffer_size_ms = + avctx->rc_buffer_size * 1000LL / + FFMAX(avctx->bit_rate, avctx->rc_max_rate); if (svt_enc->crf > 0) { param->qp = svt_enc->crf; @@ -297,7 +299,8 @@ 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->maximum_buffer_size_ms * avctx->bit_rate / 1000LL; + avctx->rc_buffer_size = param->maximum_buffer_size_ms * + FFMAX(avctx->bit_rate, avctx->rc_max_rate) / 1000LL; if (avctx->bit_rate || avctx->rc_max_rate || avctx->rc_buffer_size) { AVCPBProperties *cpb_props = ff_add_cpb_side_data(avctx); |