Skip to content

F
ffmpeg
Commit 604c4eab authored by Hii's avatar Hii Committed by Michael Niedermayer
Browse files
Options

libx264: fix -b_qfactor and -chromaoffset 

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 46ad2c4a
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 2 deletions
libavcodec/libx264.c
View file @ 604c4eab
...@@ -371,8 +371,6 @@ static av_cold int X264_init(AVCodecContext *avctx) ...@@ -371,8 +371,6 @@ static av_cold int X264_init(AVCodecContext *avctx)
x4->params.b_deblocking_filter = avctx->flags & CODEC_FLAG_LOOP_FILTER; x4->params.b_deblocking_filter = avctx->flags & CODEC_FLAG_LOOP_FILTER;
x4->params.rc.f_pb_factor = avctx->b_quant_factor;
x4->params.analyse.i_chroma_qp_offset = avctx->chromaoffset;
if (x4->preset || x4->tune) if (x4->preset || x4->tune)
if (x264_param_default_preset(&x4->params, x4->preset, x4->tune) < 0) { if (x264_param_default_preset(&x4->params, x4->preset, x4->tune) < 0) {
int i; int i;
...@@ -430,6 +428,10 @@ static av_cold int X264_init(AVCodecContext *avctx) ...@@ -430,6 +428,10 @@ static av_cold int X264_init(AVCodecContext *avctx)
if (avctx->i_quant_factor > 0) if (avctx->i_quant_factor > 0)
x4->params.rc.f_ip_factor = 1 / fabs(avctx->i_quant_factor); x4->params.rc.f_ip_factor = 1 / fabs(avctx->i_quant_factor);
if (avctx->b_quant_factor > 0)
x4->params.rc.f_pb_factor = avctx->b_quant_factor;
if (avctx->chromaoffset)
x4->params.analyse.i_chroma_qp_offset = avctx->chromaoffset;
if (avctx->me_method == ME_EPZS) if (avctx->me_method == ME_EPZS)
x4->params.analyse.i_me_method = X264_ME_DIA; x4->params.analyse.i_me_method = X264_ME_DIA;
...@@ -827,6 +829,7 @@ static const AVCodecDefault x264_defaults[] = { ...@@ -827,6 +829,7 @@ static const AVCodecDefault x264_defaults[] = {
{ "flags2", "0" }, { "flags2", "0" },
{ "g", "-1" }, { "g", "-1" },
{ "i_qfactor", "-1" }, { "i_qfactor", "-1" },
{ "b_qfactor", "-1" },
{ "qmin", "-1" }, { "qmin", "-1" },
{ "qmax", "-1" }, { "qmax", "-1" },
{ "qdiff", "-1" }, { "qdiff", "-1" },
......
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