MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lavfi: pass min explicitly to samples_ready().

Browse Source
This commit is contained in:
Nicolas George 2016-12-22 14:21:24 +01:00
parent e7e4c8dfbe
commit 2e5af443c3
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavfilter/avfilter.c
View File

@ -1178,10 +1178,10 @@ error:
return AVERROR_PATCHWELCOME;
}
static int samples_ready(AVFilterLink *link)
static int samples_ready(AVFilterLink *link, unsigned min)
{
return ff_framequeue_queued_frames(&link->fifo) &&
(ff_framequeue_queued_samples(&link->fifo) >= link->min_samples ||
(ff_framequeue_queued_samples(&link->fifo) >= min ||
link->status_in);
}
@ -1194,7 +1194,7 @@ static int take_samples(AVFilterLink *link, unsigned min, unsigned max,
/* Note: this function relies on no format changes and must only be
called with enough samples. */
av_assert1(samples_ready(link));
av_assert1(samples_ready(link, link->min_samples));
frame0 = frame = ff_framequeue_peek(&link->fifo, 0);
if (frame->nb_samples >= min && frame->nb_samples < max) {
*rframe = ff_framequeue_take(&link->fifo);
@ -1321,7 +1321,7 @@ static int ff_filter_activate_default(AVFilterContext *filter)
unsigned i;
for (i = 0; i < filter->nb_inputs; i++) {
if (samples_ready(filter->inputs[i])) {
if (samples_ready(filter->inputs[i], filter->inputs[i]->min_samples)) {
return ff_filter_frame_to_filter(filter->inputs[i]);
}
}