diff mbox

[FFmpeg-devel,07/17] lavfi: pass min explicitly to samples_ready().

Message ID 20161229143403.2851-7-george@nsup.org
State Accepted
Headers show

Commit Message

Nicolas George Dec. 29, 2016, 2:33 p.m. UTC 
Signed-off-by: Nicolas George <george@nsup.org>
---
 libavfilter/avfilter.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)


Unchanged.

Comments

Michael Niedermayer Dec. 29, 2016, 8 p.m. UTC | #1 
On Thu, Dec 29, 2016 at 03:33:53PM +0100, Nicolas George wrote:
> Signed-off-by: Nicolas George <george@nsup.org>
> ---
>  libavfilter/avfilter.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> 
> Unchanged.

should be ok

[...]
diff mbox

Patch

diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index d1ba7d9bad..d31c9f738b 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -1177,10 +1177,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);
 }
 
@@ -1193,7 +1193,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);
@@ -1320,7 +1320,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]);
         }
     }