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

avfilter/af_dynaudnorm: do not hang forever if only EOF is received

This commit is contained in:
Paul B Mahol 2020-01-01 13:35:31 +01:00
parent 7bb09e57e0
commit d4d6280ab2
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavfilter/af_dynaudnorm.c
View File

@ -67,7 +67,6 @@ typedef struct DynamicAudioNormalizerContext {
double *weights; double *weights;
int channels; int channels;
int delay;
int eof; int eof;
int64_t pts; int64_t pts;
@ -345,7 +344,6 @@ static int config_input(AVFilterLink *inlink)
init_gaussian_filter(s); init_gaussian_filter(s);
s->channels = inlink->channels; s->channels = inlink->channels;
s->delay = s->filter_size;
return 0; return 0;
} }
@ -717,7 +715,6 @@ static int flush_buffer(DynamicAudioNormalizerContext *s, AVFilterLink *inlink,
} }
} }
s->delay--;
return filter_frame(inlink, out); return filter_frame(inlink, out);
} }
@ -734,7 +731,6 @@ static int flush(AVFilterLink *outlink)
s->pts = out->pts; s->pts = out->pts;
ret = ff_filter_frame(outlink, out); ret = ff_filter_frame(outlink, out);
s->delay = s->queue.available;
} }
return ret; return ret;
@ -772,10 +768,10 @@ static int activate(AVFilterContext *ctx)
s->eof = 1; s->eof = 1;
} }
if (s->eof && s->delay > 0) if (s->eof && s->queue.available)
return flush(outlink); return flush(outlink);
if (s->eof && s->delay <= 0) { if (s->eof && !s->queue.available) {
ff_outlink_set_status(outlink, AVERROR_EOF, s->pts); ff_outlink_set_status(outlink, AVERROR_EOF, s->pts);
return 0; return 0;
} }