提交 b63f5029 编写于 作者: J Jun Zhao

lavc/libx264: misc style fixes

commit 4ed3a01d missed coding style fix.
Signed-off-by: NJun Zhao <barryjzhao@tencent.com>
上级 3c346298
...@@ -195,51 +195,51 @@ static void reconfig_encoder(AVCodecContext *ctx, const AVFrame *frame) ...@@ -195,51 +195,51 @@ static void reconfig_encoder(AVCodecContext *ctx, const AVFrame *frame)
AVFrameSideData *side_data; AVFrameSideData *side_data;
if (x4->avcintra_class < 0) { if (x4->avcintra_class < 0) {
if (x4->params.b_interlaced && x4->params.b_tff != frame->top_field_first) { if (x4->params.b_interlaced && x4->params.b_tff != frame->top_field_first) {
x4->params.b_tff = frame->top_field_first; x4->params.b_tff = frame->top_field_first;
x264_encoder_reconfig(x4->enc, &x4->params); x264_encoder_reconfig(x4->enc, &x4->params);
} }
if (x4->params.vui.i_sar_height*ctx->sample_aspect_ratio.num != ctx->sample_aspect_ratio.den * x4->params.vui.i_sar_width) { if (x4->params.vui.i_sar_height*ctx->sample_aspect_ratio.num != ctx->sample_aspect_ratio.den * x4->params.vui.i_sar_width) {
x4->params.vui.i_sar_height = ctx->sample_aspect_ratio.den; x4->params.vui.i_sar_height = ctx->sample_aspect_ratio.den;
x4->params.vui.i_sar_width = ctx->sample_aspect_ratio.num; x4->params.vui.i_sar_width = ctx->sample_aspect_ratio.num;
x264_encoder_reconfig(x4->enc, &x4->params); x264_encoder_reconfig(x4->enc, &x4->params);
} }
if (x4->params.rc.i_vbv_buffer_size != ctx->rc_buffer_size / 1000 || 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_max_bitrate != ctx->rc_max_rate / 1000) {
x4->params.rc.i_vbv_buffer_size = ctx->rc_buffer_size / 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; x4->params.rc.i_vbv_max_bitrate = ctx->rc_max_rate / 1000;
x264_encoder_reconfig(x4->enc, &x4->params); x264_encoder_reconfig(x4->enc, &x4->params);
} }
if (x4->params.rc.i_rc_method == X264_RC_ABR && 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) {
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); x264_encoder_reconfig(x4->enc, &x4->params);
} }
if (x4->crf >= 0 && if (x4->crf >= 0 &&
x4->params.rc.i_rc_method == X264_RC_CRF && 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) {
x4->params.rc.f_rf_constant = x4->crf; x4->params.rc.f_rf_constant = x4->crf;
x264_encoder_reconfig(x4->enc, &x4->params); x264_encoder_reconfig(x4->enc, &x4->params);
} }
if (x4->params.rc.i_rc_method == X264_RC_CQP && if (x4->params.rc.i_rc_method == X264_RC_CQP &&
x4->cqp >= 0 && x4->cqp >= 0 &&
x4->params.rc.i_qp_constant != x4->cqp) { x4->params.rc.i_qp_constant != x4->cqp) {
x4->params.rc.i_qp_constant = x4->cqp; x4->params.rc.i_qp_constant = x4->cqp;
x264_encoder_reconfig(x4->enc, &x4->params); x264_encoder_reconfig(x4->enc, &x4->params);
} }
if (x4->crf_max >= 0 && if (x4->crf_max >= 0 &&
x4->params.rc.f_rf_constant_max != x4->crf_max) { x4->params.rc.f_rf_constant_max != 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); x264_encoder_reconfig(x4->enc, &x4->params);
}
} }
}
side_data = av_frame_get_side_data(frame, AV_FRAME_DATA_STEREO3D); side_data = av_frame_get_side_data(frame, AV_FRAME_DATA_STEREO3D);
if (side_data) { if (side_data) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册