RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-27 01:01:07 +00:00
Code Issues Projects Releases Wiki Activity

lavfi/af_amix: make sure the output does not depend on input ordering

Browse Source 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
This commit is contained in:
Paul B Mahol 2023-10-28 13:41:01 +02:00 committed by Anton Khirnov
parent de85815bfa
commit 7282137f48
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavfilter/af_amix.c
View File

@ -394,6 +394,8 @@ static int request_samples(AVFilterContext *ctx, int min_samples)
int i; int i;
av_assert0(s->nb_inputs > 1); av_assert0(s->nb_inputs > 1);
if (min_samples == 1 && s->duration_mode == DURATION_FIRST)
min_samples = av_audio_fifo_size(s->fifos[0]);
for (i = 1; i < s->nb_inputs; i++) { for (i = 1; i < s->nb_inputs; i++) {
if (!(s->input_state[i] & INPUT_ON) || if (!(s->input_state[i] & INPUT_ON) ||
@ -402,6 +404,7 @@ static int request_samples(AVFilterContext *ctx, int min_samples)
if (av_audio_fifo_size(s->fifos[i]) >= min_samples) if (av_audio_fifo_size(s->fifos[i]) >= min_samples)
continue; continue;
ff_inlink_request_frame(ctx->inputs[i]); ff_inlink_request_frame(ctx->inputs[i]);
return 0;
} }
return output_frame(ctx->outputs[0]); return output_frame(ctx->outputs[0]);
} }
@ -471,17 +474,13 @@ static int activate(AVFilterContext *ctx)
if (ff_inlink_acknowledge_status(ctx->inputs[i], &status, &pts)) { if (ff_inlink_acknowledge_status(ctx->inputs[i], &status, &pts)) {
if (status == AVERROR_EOF) { if (status == AVERROR_EOF) {
if (i == 0) { s->input_state[i] |= INPUT_EOF;
s->input_state[i] = 0; if (av_audio_fifo_size(s->fifos[i]) == 0) {
s->input_state[i] &= ~INPUT_ON;
if (s->nb_inputs == 1) { if (s->nb_inputs == 1) {
ff_outlink_set_status(outlink, status, pts); ff_outlink_set_status(outlink, status, pts);
return 0; return 0;
} }
} else {
s->input_state[i] |= INPUT_EOF;
if (av_audio_fifo_size(s->fifos[i]) == 0) {
s->input_state[i] = 0;
}
} }
} }
} }