har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/libsvtav1: use larger of bit rate and max rate for buffer size

Browse Source 
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.
This commit is contained in:
Jan Ekström 2023-03-09 20:27:06 +02:00
parent 1231003c3c
commit fba9d9609f
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/libsvtav1.c
View File

@ -184,8 +184,10 @@ static int config_enc_params(EbSvtAv1EncConfiguration *param,
param->min_qp_allowed = avctx->qmin; param->min_qp_allowed = avctx->qmin;
} }
param->max_bit_rate = avctx->rc_max_rate; param->max_bit_rate = avctx->rc_max_rate;
if (avctx->bit_rate && avctx->rc_buffer_size) if ((avctx->bit_rate > 0 || avctx->rc_max_rate > 0) && avctx->rc_buffer_size)
param->maximum_buffer_size_ms = avctx->rc_buffer_size * 1000LL / avctx->bit_rate; param->maximum_buffer_size_ms =
avctx->rc_buffer_size * 1000LL /
FFMAX(avctx->bit_rate, avctx->rc_max_rate);
if (svt_enc->crf > 0) { if (svt_enc->crf > 0) {
param->qp = svt_enc->crf; param->qp = svt_enc->crf;
@ -302,7 +304,8 @@ static int config_enc_params(EbSvtAv1EncConfiguration *param,
avctx->bit_rate = param->rate_control_mode > 0 ? avctx->bit_rate = param->rate_control_mode > 0 ?
param->target_bit_rate : 0; param->target_bit_rate : 0;
avctx->rc_max_rate = param->max_bit_rate; 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) { if (avctx->bit_rate || avctx->rc_max_rate || avctx->rc_buffer_size) {
AVCPBProperties *cpb_props = ff_add_cpb_side_data(avctx); AVCPBProperties *cpb_props = ff_add_cpb_side_data(avctx);