[FFmpeg-devel,05/17] lavfi: add ff_link_process_commands().

Submitted by Nicolas George on Dec. 24, 2016, 5:41 p.m.

Details

Message ID 20161224174149.8995-6-george@nsup.org
State New
Headers show

Commit Message

Nicolas George Dec. 24, 2016, 5:41 p.m.
Signed-off-by: Nicolas George <george@nsup.org>
---
 libavfilter/avfilter.c | 24 +++++++++++++++---------
 libavfilter/internal.h |  6 ++++++
 2 files changed, 21 insertions(+), 9 deletions(-)

Patch hide | download patch | download mbox

diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c
index 83daef4609..b05a75182a 100644
--- a/libavfilter/avfilter.c
+++ b/libavfilter/avfilter.c
@@ -1099,7 +1099,6 @@  static int ff_filter_frame_framed(AVFilterLink *link, AVFrame *frame)
     AVFilterContext *dstctx = link->dst;
     AVFilterPad *dst = link->dstpad;
     int ret;
-    AVFilterCommand *cmd= link->dst->command_queue;
     int64_t pts;
 
     if (!(filter_frame = dst->filter_frame))
@@ -1111,14 +1110,7 @@  static int ff_filter_frame_framed(AVFilterLink *link, AVFrame *frame)
             goto fail;
     }
 
-    while(cmd && cmd->time <= frame->pts * av_q2d(link->time_base)){
-        av_log(link->dst, AV_LOG_DEBUG,
-               "Processing command time:%f command:%s arg:%s\n",
-               cmd->time, cmd->command, cmd->arg);
-        avfilter_process_command(link->dst, cmd->command, cmd->arg, 0, 0, cmd->flags);
-        ff_command_queue_pop(link->dst);
-        cmd= link->dst->command_queue;
-    }
+    ff_link_process_commands(link, frame);
 
     pts = frame->pts;
     if (dstctx->enable_str) {
@@ -1565,6 +1557,20 @@  int ff_link_make_frame_writable(AVFilterLink *link, AVFrame **rframe)
     return 0;
 }
 
+void ff_link_process_commands(AVFilterLink *link, const AVFrame *frame)
+{
+    AVFilterCommand *cmd = link->dst->command_queue;
+
+    while(cmd && cmd->time <= frame->pts * av_q2d(link->time_base)){
+        av_log(link->dst, AV_LOG_DEBUG,
+               "Processing command time:%f command:%s arg:%s\n",
+               cmd->time, cmd->command, cmd->arg);
+        avfilter_process_command(link->dst, cmd->command, cmd->arg, 0, 0, cmd->flags);
+        ff_command_queue_pop(link->dst);
+        cmd= link->dst->command_queue;
+    }
+}
+
 const AVClass *avfilter_get_class(void)
 {
     return &avfilter_class;
diff --git a/libavfilter/internal.h b/libavfilter/internal.h
index 422363477b..1a78dc2785 100644
--- a/libavfilter/internal.h
+++ b/libavfilter/internal.h
@@ -631,4 +631,10 @@  int ff_link_acknowledge_status(AVFilterLink *link);
  */
 int ff_link_make_frame_writable(AVFilterLink *link, AVFrame **rframe);
 
+/**
+ * Process the commands queued in the link up to the time of the frame.
+ * Commands will trigger the process_command() callback.
+ */
+void ff_link_process_commands(AVFilterLink *link, const AVFrame *frame);
+
 #endif /* AVFILTER_INTERNAL_H */