Skip to content

F
ffmpeg.wasm-core
Commit 8b75e45d authored by Loren Merritt's avatar Loren Merritt
Browse files
Options

sync to x264 r537 

Originally committed as revision 5780 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent fd0fb306
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 3 deletions
libavcodec/x264.c
View file @ 8b75e45d
...@@ -142,13 +142,18 @@ X264_init(AVCodecContext *avctx) ...@@ -142,13 +142,18 @@ X264_init(AVCodecContext *avctx)
x4->params.rc.b_stat_write = (avctx->flags & CODEC_FLAG_PASS1); x4->params.rc.b_stat_write = (avctx->flags & CODEC_FLAG_PASS1);
if(avctx->flags & CODEC_FLAG_PASS2) x4->params.rc.b_stat_read = 1; if(avctx->flags & CODEC_FLAG_PASS2) x4->params.rc.b_stat_read = 1;
else{ else{
if(avctx->crf) x4->params.rc.i_rf_constant = avctx->crf; if(avctx->crf){
else if(avctx->cqp > -1) x4->params.rc.i_qp_constant = avctx->cqp; x4->params.rc.i_rc_method = X264_RC_CRF;
x4->params.rc.i_rf_constant = avctx->crf;
}else if(avctx->cqp > -1){
x4->params.rc.i_rc_method = X264_RC_CQP;
x4->params.rc.i_qp_constant = avctx->cqp;
}
} }
// if neither crf nor cqp modes are selected we have to enable the RC // if neither crf nor cqp modes are selected we have to enable the RC
// we do it this way because we cannot check if the bitrate has been set // we do it this way because we cannot check if the bitrate has been set
if(!(avctx->crf || (avctx->cqp > -1))) x4->params.rc.b_cbr = 1; if(!(avctx->crf || (avctx->cqp > -1))) x4->params.rc.i_rc_method = X264_RC_ABR;
x4->params.i_bframe = avctx->max_b_frames; x4->params.i_bframe = avctx->max_b_frames;
x4->params.b_cabac = avctx->coder_type == FF_CODER_TYPE_AC; x4->params.b_cabac = avctx->coder_type == FF_CODER_TYPE_AC;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment