diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-12 00:55:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-12 01:19:57 +0200 |
| commit | 8159fe255ccadbb81c52f192f48d9dc6fc3e5537 (patch) | |
| tree | 62bbb36bf8813e184afc106e904d3f72409c5122 | |
| parent | 508e7a5c16c93ae3df31d79b7e808cb7bc893b52 (diff) | |
| parent | 2f4170312f605c1f02a14c01347e94cf46726dbd (diff) | |
| download | ffmpeg-8159fe255ccadbb81c52f192f48d9dc6fc3e5537.tar.gz | |
Merge commit '2f4170312f605c1f02a14c01347e94cf46726dbd'
* commit '2f4170312f605c1f02a14c01347e94cf46726dbd':
libx264: Support bitrate reconfiguration
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/libx264.c | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 474c247f45..0b304cbe10 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -194,6 +194,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; |