From 95b854dd0630183d4130ad27097796ef167eb96b Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Fri, 12 Feb 2021 22:58:13 +0100 Subject: avfilter/af_amix: rename sum option to normalize It makes more sense to still use provided weights. --- libavfilter/af_amix.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'libavfilter/af_amix.c') diff --git a/libavfilter/af_amix.c b/libavfilter/af_amix.c index beaf7bcada..45a5dadf0a 100644 --- a/libavfilter/af_amix.c +++ b/libavfilter/af_amix.c @@ -164,7 +164,7 @@ typedef struct MixContext { int duration_mode; /**< mode for determining duration */ float dropout_transition; /**< transition time when an input drops out */ char *weights_str; /**< string for custom weights for every input */ - int sum; /**< inputs are not scaled, only added */ + int normalize; /**< if inputs are scaled */ int nb_channels; /**< number of channels */ int sample_rate; /**< sample rate */ @@ -196,8 +196,8 @@ static const AVOption amix_options[] = { OFFSET(dropout_transition), AV_OPT_TYPE_FLOAT, { .dbl = 2.0 }, 0, INT_MAX, A|F }, { "weights", "Set weight for each input.", OFFSET(weights_str), AV_OPT_TYPE_STRING, {.str="1 1"}, 0, 0, A|F|T }, - { "sum", "Do not scale inputs instead do only sum", - OFFSET(sum), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, A|F|T }, + { "normalize", "Scale inputs", + OFFSET(normalize), AV_OPT_TYPE_BOOL, {.i64=1}, 0, 1, A|F|T }, { NULL } }; @@ -231,8 +231,8 @@ static void calculate_scales(MixContext *s, int nb_samples) for (i = 0; i < s->nb_inputs; i++) { if (s->input_state[i] & INPUT_ON) { - if (s->sum) - s->input_scale[i] = 1.0f; + if (!s->normalize) + s->input_scale[i] = FFABS(s->weights[i]); else s->input_scale[i] = 1.0f / s->scale_norm[i] * FFSIGN(s->weights[i]); } else { -- cgit v1.2.3