Revert "aviobuf: Discard old buffered, previously read data in ffio_read_partial"

[ffmpeg] / libavfilter / f_interleave.c

diff --git a/libavfilter/f_interleave.c b/libavfilter/f_interleave.c
index 368ce6e678bc8b58d8b567c05407dcb4fc2b7377..024657c024d8f4d0f5935bf9e2506c31b6f16b19 100644 (file)
--- a/libavfilter/f_interleave.c
+++ b/libavfilter/f_interleave.c
@@ -64,26 +64,40 @@ static int activate(AVFilterContext *ctx)
     AVFilterLink *outlink = ctx->outputs[0];
     InterleaveContext *s = ctx->priv;
     int64_t q_pts, pts = INT64_MAX;
-    int i, nb_eofs = 0, input_idx = -1, nb_active_inputs = 0;
+    int i, nb_eofs = 0, input_idx = -1;
+    int first_eof = 0;
+    int64_t rpts;
+    int status;
     int nb_inputs_with_frames = 0;
 
     FF_FILTER_FORWARD_STATUS_BACK_ALL(outlink, ctx);
 
     for (i = 0; i < ctx->nb_inputs; i++) {
-        if (!ff_outlink_get_status(ctx->inputs[i])) {
-            nb_active_inputs++;
-            if (!ff_inlink_queued_frames(ctx->inputs[i]))
-                break;
-            nb_inputs_with_frames++;
-        }
+        int is_eof = !!ff_inlink_acknowledge_status(ctx->inputs[i], &status, &rpts);
+
+        nb_eofs += is_eof;
+        if (i == 0)
+            first_eof = is_eof;
+    }
+
+    if ((nb_eofs > 0 && s->duration_mode == DURATION_SHORTEST) ||
+        (nb_eofs == ctx->nb_inputs && s->duration_mode == DURATION_LONGEST) ||
+        (first_eof && s->duration_mode == DURATION_FIRST)) {
+        ff_outlink_set_status(outlink, AVERROR_EOF, s->pts);
+        return 0;
+    }
+
+    for (i = 0; i < ctx->nb_inputs; i++) {
+        if (!ff_inlink_queued_frames(ctx->inputs[i]))
+            continue;
+        nb_inputs_with_frames++;
     }
 
-    if (nb_active_inputs > 0 && nb_active_inputs == nb_inputs_with_frames) {
+    if (nb_inputs_with_frames >= ctx->nb_inputs - nb_eofs) {
         for (i = 0; i < ctx->nb_inputs; i++) {
             AVFrame *frame;
 
-            if (ff_outlink_get_status(ctx->inputs[i]) ||
-                ff_inlink_queued_frames(ctx->inputs[i]) == 0)
+            if (ff_inlink_queued_frames(ctx->inputs[i]) == 0)
                 continue;
 
             frame = ff_inlink_peek_frame(ctx->inputs[i], 0);
@@ -119,16 +133,6 @@ static int activate(AVFilterContext *ctx)
         }
     }
 
-    for (i = 0; i < ctx->nb_inputs; i++)
-        nb_eofs += !!ff_outlink_get_status(ctx->inputs[i]);
-
-    if ((nb_eofs > 0 && s->duration_mode == DURATION_SHORTEST) ||
-        (nb_eofs == ctx->nb_inputs && s->duration_mode == DURATION_LONGEST) ||
-        (ff_outlink_get_status(ctx->inputs[0]) && s->duration_mode == DURATION_FIRST)) {
-        ff_outlink_set_status(outlink, AVERROR_EOF, s->pts);
-        return 0;
-    }
-
     for (i = 0; i < ctx->nb_inputs; i++) {
         if (ff_inlink_queued_frames(ctx->inputs[i]))
             continue;
@@ -139,6 +143,11 @@ static int activate(AVFilterContext *ctx)
         }
     }
 
+    if (i == ctx->nb_inputs - nb_eofs && ff_outlink_frame_wanted(outlink)) {
+        ff_filter_set_ready(ctx, 100);
+        return 0;
+    }
+
     return FFERROR_NOT_READY;
 }