summaryrefslogtreecommitdiff
path: root/libavcodec/libx264.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2011-09-07 09:13:02 +0200
committerAnton Khirnov <anton@khirnov.net>2011-09-07 10:36:15 +0200
commit0962f23b35ec6aa497f8338a7ddc2d82fda0a400 (patch)
tree06644b40d6b63a481e1ab10fba8f6ca73d17ddbe /libavcodec/libx264.c
parent2bb5d637fc9821247cd4cd49a048bd52966ebb34 (diff)
libx264: fix setting some more parameters
Specifically, trellis, nr, me_range, me_method, subq, b_strategy, keyint_min, chroma_me and coder. Change their defaults to -1 and apply them after x264_param_default_preset() if the user explicitly set them.
Diffstat (limited to 'libavcodec/libx264.c')
-rw-r--r--libavcodec/libx264.c63
1 files changed, 36 insertions, 27 deletions
diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c
index 305c26a781..fc0ba150b6 100644
--- a/libavcodec/libx264.c
+++ b/libavcodec/libx264.c
@@ -200,35 +200,8 @@ static av_cold int X264_init(AVCodecContext *avctx)
x264_param_default(&x4->params);
- x4->params.b_cabac = avctx->coder_type == FF_CODER_TYPE_AC;
- x4->params.i_bframe_adaptive = avctx->b_frame_strategy;
-
- x4->params.i_keyint_min = avctx->keyint_min;
- if (x4->params.i_keyint_min > x4->params.i_keyint_max)
- x4->params.i_keyint_min = x4->params.i_keyint_max;
-
x4->params.b_deblocking_filter = avctx->flags & CODEC_FLAG_LOOP_FILTER;
- if (avctx->me_method == ME_EPZS)
- x4->params.analyse.i_me_method = X264_ME_DIA;
- else if (avctx->me_method == ME_HEX)
- x4->params.analyse.i_me_method = X264_ME_HEX;
- else if (avctx->me_method == ME_UMH)
- x4->params.analyse.i_me_method = X264_ME_UMH;
- else if (avctx->me_method == ME_FULL)
- x4->params.analyse.i_me_method = X264_ME_ESA;
- else if (avctx->me_method == ME_TESA)
- x4->params.analyse.i_me_method = X264_ME_TESA;
- else x4->params.analyse.i_me_method = X264_ME_HEX;
-
- x4->params.analyse.i_me_range = avctx->me_range;
- x4->params.analyse.i_subpel_refine = avctx->me_subpel_quality;
-
- x4->params.analyse.b_chroma_me = avctx->me_cmp & FF_CMP_CHROMA;
-
- x4->params.analyse.i_trellis = avctx->trellis;
- x4->params.analyse.i_noise_reduction = avctx->noise_reduction;
-
if (x4->preset || x4->tune)
if (x264_param_default_preset(&x4->params, x4->preset, x4->tune) < 0) {
av_log(avctx, AV_LOG_ERROR, "Error setting preset/tune %s/%s.\n", x4->preset, x4->tune);
@@ -332,6 +305,17 @@ static av_cold int X264_init(AVCodecContext *avctx)
x4->params.rc.b_mb_tree = !!(avctx->flags2 & CODEC_FLAG2_MBTREE);
#endif
+ if (avctx->me_method == ME_EPZS)
+ x4->params.analyse.i_me_method = X264_ME_DIA;
+ else if (avctx->me_method == ME_HEX)
+ x4->params.analyse.i_me_method = X264_ME_HEX;
+ else if (avctx->me_method == ME_UMH)
+ x4->params.analyse.i_me_method = X264_ME_UMH;
+ else if (avctx->me_method == ME_FULL)
+ x4->params.analyse.i_me_method = X264_ME_ESA;
+ else if (avctx->me_method == ME_TESA)
+ x4->params.analyse.i_me_method = X264_ME_TESA;
+
if (avctx->gop_size >= 0)
x4->params.i_keyint_max = avctx->gop_size;
if (avctx->max_b_frames >= 0)
@@ -350,6 +334,22 @@ static av_cold int X264_init(AVCodecContext *avctx)
x4->params.rc.f_qcompress = avctx->qcompress; /* 0.0 => cbr, 1.0 => constant qp */
if (avctx->refs >= 0)
x4->params.i_frame_reference = avctx->refs;
+ if (avctx->trellis >= 0)
+ x4->params.analyse.i_trellis = avctx->trellis;
+ if (avctx->me_range >= 0)
+ x4->params.analyse.i_me_range = avctx->me_range;
+ if (avctx->noise_reduction >= 0)
+ x4->params.analyse.i_noise_reduction = avctx->noise_reduction;
+ if (avctx->me_subpel_quality >= 0)
+ x4->params.analyse.i_subpel_refine = avctx->me_subpel_quality;
+ if (avctx->b_frame_strategy >= 0)
+ x4->params.i_bframe_adaptive = avctx->b_frame_strategy;
+ if (avctx->keyint_min >= 0)
+ x4->params.i_keyint_min = avctx->keyint_min;
+ if (avctx->coder_type >= 0)
+ x4->params.b_cabac = avctx->coder_type == FF_CODER_TYPE_AC;
+ if (avctx->me_cmp >= 0)
+ x4->params.analyse.b_chroma_me = avctx->me_cmp & FF_CMP_CHROMA;
if (x4->aq_mode >= 0)
x4->params.rc.i_aq_mode = x4->aq_mode;
@@ -517,6 +517,15 @@ static const AVCodecDefault x264_defaults[] = {
{ "qcomp", "-1" },
{ "refs", "-1" },
{ "sc_threshold", "-1" },
+ { "trellis", "-1" },
+ { "nr", "-1" },
+ { "me_range", "-1" },
+ { "me_method", "-1" },
+ { "subq", "-1" },
+ { "b_strategy", "-1" },
+ { "keyint_min", "-1" },
+ { "coder", "-1" },
+ { "cmp", "-1" },
{ "threads", AV_STRINGIFY(X264_THREADS_AUTO) },
{ NULL },
};