Add slicify video filter.

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

5 files changed, 126 insertions, 2 deletions

diff --git a/doc/libavfilter.texi b/doc/libavfilter.texi
index 9efeba2f68..3073b8a1f7 100644
--- a/doc/libavfilter.texi
+++ b/doc/libavfilter.texi
@@ -149,6 +149,21 @@ input to the vflip filter.
 
 Pass the source unchanged to the output.
 
+@section slicify
+
+Pass the images of input video on to next video filter as multiple
+slices.
+
+@example
+./ffmpeg -i in.avi -vfilters "slicify=32" out.avi
+@end example
+
+The filter accepts the slice height as parameter. If the parameter is
+not specified it will use the default value of 16.
+
+Adding this in the beginning of filter chains should make filtering
+faster due to better use of the memory cache.
+
 @section vflip
 
 Flip the input video vertically.
diff --git a/libavfilter/Makefile b/libavfilter/Makefile
index 84fde6074c..7ee5280826 100644
--- a/libavfilter/Makefile
+++ b/libavfilter/Makefile
@@ -15,6 +15,7 @@ OBJS-$(CONFIG_CROP_FILTER)    += vf_crop.o
 OBJS-$(CONFIG_FORMAT_FILTER)  += vf_format.o
 OBJS-$(CONFIG_NOFORMAT_FILTER) += vf_format.o
 OBJS-$(CONFIG_NULL_FILTER)    += vf_null.o
+OBJS-$(CONFIG_SLICIFY_FILTER) += vf_slicify.o
 OBJS-$(CONFIG_VFLIP_FILTER)   += vf_vflip.o
 
 include $(SUBDIR)../subdir.mak
diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c
index ac26805372..b33f54f7e9 100644
--- a/libavfilter/allfilters.c
+++ b/libavfilter/allfilters.c
@@ -38,5 +38,6 @@ void avfilter_register_all(void)
     REGISTER_FILTER (FORMAT,format,vf);
     REGISTER_FILTER (NOFORMAT,noformat,vf);
     REGISTER_FILTER (NULL,null,vf);
+    REGISTER_FILTER (SLICIFY,slicify,vf);
     REGISTER_FILTER (VFLIP,vflip,vf);
 }
diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h
index 7e38110dfb..9048aa4daa 100644
--- a/libavfilter/avfilter.h
+++ b/libavfilter/avfilter.h
@@ -23,8 +23,8 @@
 #define AVFILTER_AVFILTER_H
 
 #define LIBAVFILTER_VERSION_MAJOR  1
-#define LIBAVFILTER_VERSION_MINOR  6
-#define LIBAVFILTER_VERSION_MICRO  1
+#define LIBAVFILTER_VERSION_MINOR  7
+#define LIBAVFILTER_VERSION_MICRO  0
 
 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
                                                LIBAVFILTER_VERSION_MINOR, \
diff --git a/libavfilter/vf_slicify.c b/libavfilter/vf_slicify.c
new file mode 100644
index 0000000000..40824cefdc
--- /dev/null
+++ b/libavfilter/vf_slicify.c
@@ -0,0 +1,107 @@
+/*
+ * 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 libavfilter/vf_slicify.c
+ * video slicing filter
+ */
+
+#include "avfilter.h"
+
+typedef struct {
+    int h;          ///< output slice height
+    int vshift;     ///< vertical chroma subsampling shift
+} SliceContext;
+
+static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)
+{
+    SliceContext *slice = ctx->priv;
+
+    slice->h = 16;
+    if (args)
+        sscanf(args, "%d", &slice->h);
+
+    return 0;
+}
+
+static int config_props(AVFilterLink *link)
+{
+    SliceContext *slice = link->dst->priv;
+    int tmp;
+
+    avcodec_get_chroma_sub_sample(link->format, &tmp, &slice->vshift);
+
+    /* ensure that slices play nice with chroma subsampling, and enforce
+     * a reasonable minimum size for the slices */
+    slice->h = FFMAX(8, slice->h & (-1 << slice->vshift));
+
+    av_log(link->dst, AV_LOG_INFO, "h:%d\n", slice->h);
+
+    return 0;
+}
+
+static AVFilterPicRef *get_video_buffer(AVFilterLink *link, int perms,
+                                        int w, int h)
+{
+    return avfilter_get_video_buffer(link->dst->outputs[0], perms, w, h);
+}
+
+static void start_frame(AVFilterLink *link, AVFilterPicRef *picref)
+{
+    avfilter_start_frame(link->dst->outputs[0], picref);
+}
+
+static void end_frame(AVFilterLink *link)
+{
+    avfilter_end_frame(link->dst->outputs[0]);
+}
+
+static void draw_slice(AVFilterLink *link, int y, int h)
+{
+    SliceContext *slice = link->dst->priv;
+    int y2;
+
+    for (y2 = y; y2 + slice->h <= y + h; y2 += slice->h)
+        avfilter_draw_slice(link->dst->outputs[0], y2, slice->h);
+
+    if (y2 < y + h)
+        avfilter_draw_slice(link->dst->outputs[0], y2, y + h - y2);
+}
+
+AVFilter avfilter_vf_slicify = {
+    .name      = "slicify",
+    .description = "Pass the images of input video on to next video filter as multiple slices.",
+
+    .init      = init,
+
+    .priv_size = sizeof(SliceContext),
+
+    .inputs    = (AVFilterPad[]) {{ .name             = "default",
+                                    .type             = CODEC_TYPE_VIDEO,
+                                    .get_video_buffer = get_video_buffer,
+                                    .start_frame      = start_frame,
+                                    .draw_slice       = draw_slice,
+                                    .config_props     = config_props,
+                                    .end_frame        = end_frame, },
+                                  { .name = NULL}},
+    .outputs   = (AVFilterPad[]) {{ .name            = "default",
+                                    .type            = CODEC_TYPE_VIDEO, },
+                                  { .name = NULL}},
+};