| Message ID | 20221120190736.1781675-1-ccom@randomderp.com |
|---|---|
| State | Accepted |
| Commit | 96748ac54f998ba6fe22802799c16b4eba8d4ccc |
| Headers | show |
| Series | [FFmpeg-devel,v2] avcodec/libsvtav1: only set max_buf_sz if both bitrate and rc_buf_sz is set | expand |
| Context | Check | Description |
|---|---|---|
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
On 11/20/2022 4:07 PM, Christopher Degawa wrote: > maximum_buffer_size_ms should only be set if both are specified or if > the user sets it through -svtav1-params buf-sz=val > > Signed-off-by: Christopher Degawa <ccom@randomderp.com> > --- > libavcodec/libsvtav1.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/libavcodec/libsvtav1.c b/libavcodec/libsvtav1.c > index 48cd58a0b3..7605baddfe 100644 > --- a/libavcodec/libsvtav1.c > +++ b/libavcodec/libsvtav1.c > @@ -179,7 +179,8 @@ static int config_enc_params(EbSvtAv1EncConfiguration *param, > param->min_qp_allowed = avctx->qmin; > } > param->max_bit_rate = avctx->rc_max_rate; > - param->maximum_buffer_size_ms = avctx->rc_buffer_size * 1000LL / avctx->bit_rate; > + if (avctx->bit_rate && avctx->rc_buffer_size) > + param->maximum_buffer_size_ms = avctx->rc_buffer_size * 1000LL / avctx->bit_rate; Will apply. > > if (svt_enc->crf > 0) { > param->qp = svt_enc->crf;
diff --git a/libavcodec/libsvtav1.c b/libavcodec/libsvtav1.c index 48cd58a0b3..7605baddfe 100644 --- a/libavcodec/libsvtav1.c +++ b/libavcodec/libsvtav1.c @@ -179,7 +179,8 @@ static int config_enc_params(EbSvtAv1EncConfiguration *param, param->min_qp_allowed = avctx->qmin; } param->max_bit_rate = avctx->rc_max_rate; - param->maximum_buffer_size_ms = avctx->rc_buffer_size * 1000LL / avctx->bit_rate; + if (avctx->bit_rate && 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;
maximum_buffer_size_ms should only be set if both are specified or if the user sets it through -svtav1-params buf-sz=val Signed-off-by: Christopher Degawa <ccom@randomderp.com> --- libavcodec/libsvtav1.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)