From 7042337673ee75300a6f668fbcf3074213b06977 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Thu, 1 Sep 2011 13:15:09 +0200 Subject: libx264: add 'cplxblur' private option Deprecate AVCodecContext.complexityblur --- libavcodec/avcodec.h | 4 ++-- libavcodec/libx264.c | 8 ++++++-- libavcodec/options.c | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 8a51c5865f..828382a0b5 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2449,14 +2449,14 @@ typedef struct AVCodecContext { */ int trellis; +#if FF_API_X264_GLOBAL_OPTS /** * Reduce fluctuations in qp (before curve compression). * - encoding: Set by user. * - decoding: unused */ - float complexityblur; + attribute_deprecated float complexityblur; -#if FF_API_X264_GLOBAL_OPTS /** * in-loop deblocking filter alphac0 parameter * alpha is in the range -6...6 diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c index 331bbb0d3c..8eff59ceb9 100644 --- a/libavcodec/libx264.c +++ b/libavcodec/libx264.c @@ -61,6 +61,7 @@ typedef struct X264Context { int aud; int mbtree; char *deblock; + float cplxblur; } X264Context; static void X264_log(void *p, int level, const char *fmt, va_list args) @@ -206,8 +207,6 @@ static av_cold int X264_init(AVCodecContext *avctx) x4->params.b_deblocking_filter = avctx->flags & CODEC_FLAG_LOOP_FILTER; - x4->params.rc.f_complexity_blur = avctx->complexityblur; - x4->params.analyse.inter = 0; if (avctx->partitions) { if (avctx->partitions & X264_PART_I4X4) @@ -319,6 +318,8 @@ static av_cold int X264_init(AVCodecContext *avctx) x4->params.i_deblocking_filter_alphac0 = avctx->deblockalpha; if (avctx->deblockbeta) x4->params.i_deblocking_filter_beta = avctx->deblockbeta; + if (avctx->complexityblur >= 0) + x4->params.rc.f_complexity_blur = avctx->complexityblur; x4->params.analyse.b_ssim = avctx->flags2 & CODEC_FLAG2_SSIM; x4->params.b_intra_refresh = avctx->flags2 & CODEC_FLAG2_INTRA_REFRESH; x4->params.i_bframe_pyramid = avctx->flags2 & CODEC_FLAG2_BPYRAMID ? X264_B_PYRAMID_NORMAL : X264_B_PYRAMID_NONE; @@ -364,6 +365,8 @@ static av_cold int X264_init(AVCodecContext *avctx) x4->params.analyse.i_weighted_pred = x4->weightp; if (x4->weightb >= 0) x4->params.analyse.b_weighted_bipred = x4->weightb; + if (x4->cplxblur >= 0) + x4->params.rc.f_complexity_blur = x4->cplxblur; if (x4->ssim >= 0) x4->params.analyse.b_ssim = x4->ssim; @@ -482,6 +485,7 @@ static const AVOption options[] = { { "aud", "Use access unit delimiters.", OFFSET(aud), FF_OPT_TYPE_INT, {-1 }, -1, 1, VE}, { "mbtree", "Use macroblock tree ratecontrol.", OFFSET(mbtree), FF_OPT_TYPE_INT, {-1 }, -1, 1, VE}, { "deblock", "Loop filter parameters, in form.", OFFSET(deblock), FF_OPT_TYPE_STRING, { 0 }, 0, 0, VE}, + { "cplxblur", "Reduce fluctuations in QP (before curve compression)", OFFSET(cplxblur), FF_OPT_TYPE_FLOAT, {-1 }, -1, FLT_MAX, VE}, { NULL }, }; diff --git a/libavcodec/options.c b/libavcodec/options.c index 2861a5cfbc..f19a681a56 100644 --- a/libavcodec/options.c +++ b/libavcodec/options.c @@ -412,8 +412,8 @@ static const AVOption options[]={ {"aud", "access unit delimiters (H.264)", 0, FF_OPT_TYPE_CONST, {.dbl = CODEC_FLAG2_AUD }, INT_MIN, INT_MAX, V|E, "flags2"}, #endif {"skiprd", "RD optimal MB level residual skipping", 0, FF_OPT_TYPE_CONST, {.dbl = CODEC_FLAG2_SKIP_RD }, INT_MIN, INT_MAX, V|E, "flags2"}, -{"complexityblur", "reduce fluctuations in qp (before curve compression)", OFFSET(complexityblur), FF_OPT_TYPE_FLOAT, {.dbl = 20.0 }, FLT_MIN, FLT_MAX, V|E}, #if FF_API_X264_GLOBAL_OPTS +{"complexityblur", "reduce fluctuations in qp (before curve compression)", OFFSET(complexityblur), FF_OPT_TYPE_FLOAT, {.dbl = -1 }, -1, FLT_MAX, V|E}, {"deblockalpha", "in-loop deblocking filter alphac0 parameter", OFFSET(deblockalpha), FF_OPT_TYPE_INT, {.dbl = DEFAULT }, -6, 6, V|E}, {"deblockbeta", "in-loop deblocking filter beta parameter", OFFSET(deblockbeta), FF_OPT_TYPE_INT, {.dbl = DEFAULT }, -6, 6, V|E}, #endif -- cgit v1.2.3