Add fifo filter.

Originally committed as revision 24896 to svn://svn.ffmpeg.org/ffmpeg/trunk

5 files changed, 131 insertions, 1 deletions

diff --git a/doc/filters.texi b/doc/filters.texi
index a00e850b9f..60ecf5676d 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -55,6 +55,15 @@ corner of the input image.
 
 The default value of @var{width} and @var{height} is 0.
 
+@section fifo
+
+Buffer input images and send them when they are requested.
+
+This filter is mainly useful when auto-inserted by the libavfilter
+framework.
+
+The filter does not take parameters.
+
 @section format
 
 Convert the input video to one of the specified pixel formats.
diff --git a/libavfilter/Makefile b/libavfilter/Makefile
index 443a5c62fe..d2a40c4c16 100644
--- a/libavfilter/Makefile
+++ b/libavfilter/Makefile
@@ -18,6 +18,7 @@ OBJS-$(CONFIG_ANULL_FILTER)                  += af_anull.o
 
 OBJS-$(CONFIG_ASPECT_FILTER)                 += vf_aspect.o
 OBJS-$(CONFIG_CROP_FILTER)                   += vf_crop.o
+OBJS-$(CONFIG_FIFO_FILTER)                   += vf_fifo.o
 OBJS-$(CONFIG_FORMAT_FILTER)                 += vf_format.o
 OBJS-$(CONFIG_HFLIP_FILTER)                  += vf_hflip.o
 OBJS-$(CONFIG_NOFORMAT_FILTER)               += vf_format.o
diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c
index 66bcf967e5..27442f6927 100644
--- a/libavfilter/allfilters.c
+++ b/libavfilter/allfilters.c
@@ -38,6 +38,7 @@ void avfilter_register_all(void)
 
     REGISTER_FILTER (ASPECT,      aspect,      vf);
     REGISTER_FILTER (CROP,        crop,        vf);
+    REGISTER_FILTER (FIFO,        fifo,        vf);
     REGISTER_FILTER (FORMAT,      format,      vf);
     REGISTER_FILTER (HFLIP,       hflip,       vf);
     REGISTER_FILTER (NOFORMAT,    noformat,    vf);
diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h
index 5dc72e604f..dfe27e7734 100644
--- a/libavfilter/avfilter.h
+++ b/libavfilter/avfilter.h
@@ -25,7 +25,7 @@
 #include "libavutil/avutil.h"
 
 #define LIBAVFILTER_VERSION_MAJOR  1
-#define LIBAVFILTER_VERSION_MINOR 37
+#define LIBAVFILTER_VERSION_MINOR 38
 #define LIBAVFILTER_VERSION_MICRO  0
 
 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
diff --git a/libavfilter/vf_fifo.c b/libavfilter/vf_fifo.c
new file mode 100644
index 0000000000..cb9eebf5d0
--- /dev/null
+++ b/libavfilter/vf_fifo.c
@@ -0,0 +1,119 @@
+/*
+ * copyright (c) 2007 Bobby Bingham
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+/**
+ * @file
+ * FIFO buffering video filter
+ */
+
+#include "avfilter.h"
+
+typedef struct BufPic {
+    AVFilterBufferRef *picref;
+    struct BufPic     *next;
+} BufPic;
+
+typedef struct {
+    BufPic  root;
+    BufPic *last;   ///< last buffered picture
+} FifoContext;
+
+static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)
+{
+    FifoContext *fifo = ctx->priv;
+    fifo->last = &fifo->root;
+
+    av_log(ctx, AV_LOG_INFO, "\n");
+    return 0;
+}
+
+static av_cold void uninit(AVFilterContext *ctx)
+{
+    FifoContext *fifo = ctx->priv;
+    BufPic *pic, *tmp;
+
+    for (pic = fifo->root.next; pic; pic = tmp) {
+        tmp = pic->next;
+        avfilter_unref_buffer(pic->picref);
+        av_free(pic);
+    }
+}
+
+static void start_frame(AVFilterLink *inlink, AVFilterBufferRef *picref)
+{
+    FifoContext *fifo = inlink->dst->priv;
+
+    fifo->last->next = av_mallocz(sizeof(BufPic));
+    fifo->last = fifo->last->next;
+    fifo->last->picref = picref;
+}
+
+static void end_frame(AVFilterLink *inlink) { }
+
+static void draw_slice(AVFilterLink *inlink, int y, int h, int slice_dir) { }
+
+static int request_frame(AVFilterLink *outlink)
+{
+    FifoContext *fifo = outlink->src->priv;
+    BufPic *tmp;
+    int ret;
+
+    if (!fifo->root.next) {
+        if ((ret = avfilter_request_frame(outlink->src->inputs[0]) < 0))
+            return ret;
+    }
+
+    /* by doing this, we give ownership of the reference to the next filter,
+     * so we don't have to worry about dereferencing it ourselves. */
+    avfilter_start_frame(outlink, fifo->root.next->picref);
+    avfilter_draw_slice (outlink, 0, outlink->h, 1);
+    avfilter_end_frame  (outlink);
+
+    if (fifo->last == fifo->root.next)
+        fifo->last = &fifo->root;
+    tmp = fifo->root.next->next;
+    av_free(fifo->root.next);
+    fifo->root.next = tmp;
+
+    return 0;
+}
+
+AVFilter avfilter_vf_fifo = {
+    .name      = "fifo",
+    .description = NULL_IF_CONFIG_SMALL("Buffer input images and send them when they are requested."),
+
+    .init      = init,
+    .uninit    = uninit,
+
+    .priv_size = sizeof(FifoContext),
+
+    .inputs    = (AVFilterPad[]) {{ .name            = "default",
+                                    .type            = AVMEDIA_TYPE_VIDEO,
+                                    .get_video_buffer= avfilter_null_get_video_buffer,
+                                    .start_frame     = start_frame,
+                                    .draw_slice      = draw_slice,
+                                    .end_frame       = end_frame,
+                                    .rej_perms       = AV_PERM_REUSE2, },
+                                  { .name = NULL}},
+    .outputs   = (AVFilterPad[]) {{ .name            = "default",
+                                    .type            = AVMEDIA_TYPE_VIDEO,
+                                    .request_frame   = request_frame, },
+                                  { .name = NULL}},
+};