projects / ffmpeg.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: a85835b)
avfilter/avfilter: always forward request frame in filter_activate_default
authorMarton Balint <cus@passwd.hu>
Sun, 22 Jun 2025 13:39:29 +0000 (15:39 +0200)
committerMarton Balint <cus@passwd.hu>
Thu, 3 Jul 2025 19:41:54 +0000 (21:41 +0200)
Even if all inputs are blocked an activate callback should request a frame on
some if its inputs if a frame is requested on any of its outputs.

Signed-off-by: Marton Balint <cus@passwd.hu>
libavfilter/avfilter.c patch | blob | history

diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index dd12533208f8b9528058818d54f4e752190bd38f..e03dc65fc62c2e9ef0225b4e038d75096440b335 100644 (file)
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -1283,6 +1283,11 @@ static int filter_activate_default(AVFilterContext *filter)
             return request_frame_to_filter(filter->outputs[i]);
         }
     }
+    for (i = 0; i < filter->nb_outputs; i++) {
+        FilterLinkInternal * const li = ff_link_internal(filter->outputs[i]);
+        if (li->frame_wanted_out)
+            return request_frame_to_filter(filter->outputs[i]);
+    }
     return FFERROR_NOT_READY;
 }
 
@@ -1416,6 +1421,12 @@ static int filter_activate_default(AVFilterContext *filter)
      Rationale: checking frame_blocked_in is necessary to avoid requesting
      repeatedly on a blocked input if another is not blocked (example:
      [buffersrc1][testsrc1][buffersrc2][testsrc2]concat=v=2).
+
+   - If an output has frame_wanted_out > 0 call request_frame().
+
+     Rationale: even if all inputs are blocked an activate callback should
+     request a frame on some if its inputs if a frame is requested on any of
+     its output.
  */
 
 int ff_filter_activate(AVFilterContext *filter)
FFmpeg git repo