[FFmpeg-cvslog] libx264: export CPB props side data

Anton Khirnov git at videolan.org
Thu Dec 17 13:35:09 CET 2015


ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Sat Oct  3 15:19:10 2015 +0200| [732a37d1466d45b3812509d68c82e783530e291a] | committer: Anton Khirnov

libx264: export CPB props side data

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

 libavcodec/libx264.c |    8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c
index bcbdf84..e2648f3 100644
--- a/libavcodec/libx264.c
+++ b/libavcodec/libx264.c
@@ -351,6 +351,7 @@ static int convert_pix_fmt(enum AVPixelFormat pix_fmt)
 static av_cold int X264_init(AVCodecContext *avctx)
 {
     X264Context *x4 = avctx->priv_data;
+    AVCPBProperties *cpb_props;
 
 #if CONFIG_LIBX262_ENCODER
     if (avctx->codec_id == AV_CODEC_ID_MPEG2VIDEO) {
@@ -610,6 +611,13 @@ FF_ENABLE_DEPRECATION_WARNINGS
         avctx->extradata_size = p - avctx->extradata;
     }
 
+    cpb_props = ff_add_cpb_side_data(avctx);
+    if (!cpb_props)
+        return AVERROR(ENOMEM);
+    cpb_props->buffer_size = x4->params.rc.i_vbv_buffer_size * 1000;
+    cpb_props->max_bitrate = x4->params.rc.i_vbv_max_bitrate * 1000;
+    cpb_props->avg_bitrate = x4->params.rc.i_bitrate         * 1000;
+
     return 0;
 }
 



More information about the ffmpeg-cvslog mailing list