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

avfilter/af_asetnsamples: fix sample queuing. 

When asetnsamples uses output samples < input samples, remaining samples build up in the fifo over time.
Fix this by marking the filter as ready again if there are enough samples.

Regression since ef3babb2c7
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Nikolas Bowe via ffmpeg-devel 2019-04-05 17:11:15 -07:00 committed by Michael Niedermayer
parent 8607e29fa3
commit 4c8e3725d9
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavfilter/af_asetnsamples.c
View File

@ -67,8 +67,12 @@ static int activate(AVFilterContext *ctx)
return ret;
if (ret > 0) {
if ((!s->pad || (s->pad && frame->nb_samples == s->nb_out_samples)))
return ff_filter_frame(outlink, frame);
if ((!s->pad || (s->pad && frame->nb_samples == s->nb_out_samples))) {
ret = ff_filter_frame(outlink, frame);
if (ff_framequeue_queued_samples(inlink) >= s->nb_out_samples)
ff_filter_set_ready(ctx, 100);
return ret;
}
pad_frame = ff_get_audio_buffer(outlink, s->nb_out_samples);
if (!pad_frame) {