[FFmpeg-cvslog] avcodec/libsvtav1: signal CPB properties through side data

Jan Ekström git at videolan.org
Mon May 9 23:09:31 EEST 2022


ffmpeg | branch: master | Jan Ekström <jeebjp at gmail.com> | Mon May  9 21:29:44 2022 +0300| [fe100bc556d7b25d301ed65f7ae7a74880770f09] | committer: Jan Ekström

avcodec/libsvtav1: signal CPB properties through side data

This way values such as maxrate/bufsize can be utilized further
down the chain.

First, syncs up the max_rate and buffer_size from SVT-AV1 back to
avctx, and then in case at least one of the utilized values is
nonzero, adds the CPB properties side data.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fe100bc556d7b25d301ed65f7ae7a74880770f09
---

 libavcodec/libsvtav1.c | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/libavcodec/libsvtav1.c b/libavcodec/libsvtav1.c
index 2c4ddd4641..d9ebb6aa56 100644
--- a/libavcodec/libsvtav1.c
+++ b/libavcodec/libsvtav1.c
@@ -297,8 +297,20 @@ static int config_enc_params(EbSvtAv1EncConfiguration *param,
         param->profile = FF_PROFILE_AV1_HIGH;
     }
 
-    avctx->bit_rate = param->rate_control_mode > 0 ?
-                      param->target_bit_rate : 0;
+    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;
+
+    if (avctx->bit_rate || avctx->rc_max_rate || avctx->rc_buffer_size) {
+        AVCPBProperties *cpb_props = ff_add_cpb_side_data(avctx);
+        if (!cpb_props)
+            return AVERROR(ENOMEM);
+
+        cpb_props->buffer_size = avctx->rc_buffer_size;
+        cpb_props->max_bitrate = avctx->rc_max_rate;
+        cpb_props->avg_bitrate = avctx->bit_rate;
+    }
 
     return 0;
 }



More information about the ffmpeg-cvslog mailing list