Attachment #95194 for bug #143596

View | Details | Raw Unified | Return to bug 143596
Collapse All | Expand All

Lines 136-142 Link Here

(-)cinelerra-cvs-20060827/quicktime/qth264.c (+8 lines)
136	x264_param_t default_params;	136	x264_param_t default_params;
137	x264_param_default(&default_params);	137	x264_param_default(&default_params);
138	// Reset quantizer if fixed bitrate	138	// Reset quantizer if fixed bitrate
		139	#if X264_BUILD < 48
139	if(codec->param.rc.b_cbr)	140	if(codec->param.rc.b_cbr)
		141	#else
		142	if(codec->param.rc.i_rc_method == X264_RC_ABR )
		143	#endif
140	{	144	{
141	codec->param.rc.i_qp_constant = default_params.rc.i_qp_constant;	145	codec->param.rc.i_qp_constant = default_params.rc.i_qp_constant;
142	codec->param.rc.i_qp_min = default_params.rc.i_qp_min;	146	codec->param.rc.i_qp_min = default_params.rc.i_qp_min;
Lines 469-475 Link Here
469	}	473	}
470	else	474	else
471	if(!strcasecmp(key, "h264_fix_bitrate"))	475	if(!strcasecmp(key, "h264_fix_bitrate"))
		476	#if X264_BUILD < 48
472	codec->param.rc.b_cbr = ((int)value) / 1000;	477	codec->param.rc.b_cbr = ((int)value) / 1000;
		478	#else
		479	codec->param.rc.i_bitrate = ((int)value) / 1000;
		480	#endif
473	}	481	}
474	}	482	}
475		483

Lines 135-142 Link Here

(-)cinelerra-cvs-20060827/quicktime/ffmpeg/libavcodec/x264.c (-1 / +6 lines)
135	x4->params.i_keyint_max = avctx->gop_size;	135	x4->params.i_keyint_max = avctx->gop_size;
136	x4->params.rc.i_bitrate = avctx->bit_rate / 1000;	136	x4->params.rc.i_bitrate = avctx->bit_rate / 1000;
137	x4->params.rc.i_vbv_buffer_size = avctx->rc_buffer_size / 1000;	137	x4->params.rc.i_vbv_buffer_size = avctx->rc_buffer_size / 1000;
138	if(avctx->rc_buffer_size)	138	if(avctx->rc_buffer_size){
		139	#if X264_BUILD < 48
139	x4->params.rc.b_cbr = 1;	140	x4->params.rc.b_cbr = 1;
		141	#else
		142	x4->params.rc.i_rc_method = X264_RC_ABR;
		143	#endif
		144	}
140	x4->params.i_bframe = avctx->max_b_frames;	145	x4->params.i_bframe = avctx->max_b_frames;
141	x4->params.b_cabac = avctx->coder_type == FF_CODER_TYPE_AC;	146	x4->params.b_cabac = avctx->coder_type == FF_CODER_TYPE_AC;
142		147

Return to bug 143596