RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avfilter/af_amix: fix filtering if specified weights are negative

This commit is contained in:
Paul B Mahol 2019-10-03 10:27:56 +02:00
parent 2a546fb7d5
commit d492907e78
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavfilter/af_amix.c
View File

@ -212,21 +212,21 @@ static void calculate_scales(MixContext *s, int nb_samples)
for (i = 0; i < s->nb_inputs; i++)
if (s->input_state[i] & INPUT_ON)
weight_sum += s->weights[i];
weight_sum += FFABS(s->weights[i]);
for (i = 0; i < s->nb_inputs; i++) {
if (s->input_state[i] & INPUT_ON) {
if (s->scale_norm[i] > weight_sum / s->weights[i]) {
s->scale_norm[i] -= ((s->weight_sum / s->weights[i]) / s->nb_inputs) *
if (s->scale_norm[i] > weight_sum / FFABS(s->weights[i])) {
s->scale_norm[i] -= ((s->weight_sum / FFABS(s->weights[i])) / s->nb_inputs) *
nb_samples / (s->dropout_transition * s->sample_rate);
s->scale_norm[i] = FFMAX(s->scale_norm[i], weight_sum / s->weights[i]);
s->scale_norm[i] = FFMAX(s->scale_norm[i], weight_sum / FFABS(s->weights[i]));
}
}
}
for (i = 0; i < s->nb_inputs; i++) {
if (s->input_state[i] & INPUT_ON)
s->input_scale[i] = 1.0f / s->scale_norm[i];
s->input_scale[i] = 1.0f / s->scale_norm[i] * FFSIGN(s->weights[i]);
else
s->input_scale[i] = 0.0f;
}
@ -270,7 +270,7 @@ static int config_output(AVFilterLink *outlink)
if (!s->input_scale || !s->scale_norm)
return AVERROR(ENOMEM);
for (i = 0; i < s->nb_inputs; i++)
s->scale_norm[i] = s->weight_sum / s->weights[i];
s->scale_norm[i] = s->weight_sum / FFABS(s->weights[i]);
calculate_scales(s, 0);
av_get_channel_layout_string(buf, sizeof(buf), -1, outlink->channel_layout);
@ -540,12 +540,12 @@ static av_cold int init(AVFilterContext *ctx)
p = NULL;
sscanf(arg, "%f", &last_weight);
s->weights[i] = last_weight;
s->weight_sum += last_weight;
s->weight_sum += FFABS(last_weight);
}
for (; i < s->nb_inputs; i++) {
s->weights[i] = last_weight;
s->weight_sum += last_weight;
s->weight_sum += FFABS(last_weight);
}
return 0;