[SCM] libav/experimental: libx264: Support bitrate reconfiguration
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Aug 10 16:03:27 UTC 2014
The following commit has been merged in the experimental branch:
commit 2f4170312f605c1f02a14c01347e94cf46726dbd
Author: Luca Barbato <lu_zero at gentoo.org>
Date: Tue Jun 10 14:31:48 2014 +0200
libx264: Support bitrate reconfiguration
Signed-off-by: Luca Barbato <lu_zero at gentoo.org>
diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c
index 6233f1e..06e917e 100644
--- a/libavcodec/libx264.c
+++ b/libavcodec/libx264.c
@@ -166,6 +166,37 @@ static int X264_frame(AVCodecContext *ctx, AVPacket *pkt, const AVFrame *frame,
x264_encoder_reconfig(x4->enc, &x4->params);
}
+ if (x4->params.rc.i_vbv_buffer_size != ctx->rc_buffer_size / 1000 ||
+ x4->params.rc.i_vbv_max_bitrate != ctx->rc_max_rate / 1000) {
+ x4->params.rc.i_vbv_buffer_size = ctx->rc_buffer_size / 1000;
+ x4->params.rc.i_vbv_max_bitrate = ctx->rc_max_rate / 1000;
+ x264_encoder_reconfig(x4->enc, &x4->params);
+ }
+
+ if (x4->params.rc.i_rc_method == X264_RC_ABR &&
+ x4->params.rc.i_bitrate != ctx->bit_rate / 1000) {
+ x4->params.rc.i_bitrate = ctx->bit_rate / 1000;
+ x264_encoder_reconfig(x4->enc, &x4->params);
+ }
+
+ if (x4->params.rc.i_rc_method == X264_RC_CRF &&
+ x4->params.rc.f_rf_constant != x4->crf) {
+ x4->params.rc.f_rf_constant = x4->crf;
+ x264_encoder_reconfig(x4->enc, &x4->params);
+ }
+
+ if (x4->params.rc.i_rc_method == X264_RC_CQP &&
+ x4->params.rc.i_qp_constant != x4->cqp) {
+ x4->params.rc.i_qp_constant = x4->cqp;
+ x264_encoder_reconfig(x4->enc, &x4->params);
+ }
+
+ if (x4->crf_max &&
+ x4->params.rc.f_rf_constant_max != x4->crf_max) {
+ x4->params.rc.f_rf_constant_max = x4->crf_max;
+ x264_encoder_reconfig(x4->enc, &x4->params);
+ }
+
side_data = av_frame_get_side_data(frame, AV_FRAME_DATA_STEREO3D);
if (side_data) {
AVStereo3D *stereo = (AVStereo3D *)side_data->data;
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list