aboutsummaryrefslogtreecommitdiffstats
path: root/libavfilter
diff options
context:
space:
mode:
authorStefano Sabatini <stefano.sabatini-lala@poste.it>2010-09-14 13:21:13 +0000
committerStefano Sabatini <stefano.sabatini-lala@poste.it>2010-09-14 13:21:13 +0000
commit6ebf0bfc17253e29a226e888fb9b7b31574a2eed (patch)
tree2ecb2e1180faaec6ec691514b93b8ad987b5479b /libavfilter
parentc12f7b2d2cf45b18dbabb207bcf142e5f170c773 (diff)
downloadffmpeg-6ebf0bfc17253e29a226e888fb9b7b31574a2eed.tar.gz
Implement libopencv smooth filter.
Originally committed as revision 25118 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavfilter')
-rw-r--r--libavfilter/Makefile1
-rw-r--r--libavfilter/allfilters.c1
-rw-r--r--libavfilter/avfilter.h4
-rw-r--r--libavfilter/vf_libopencv.c156
4 files changed, 160 insertions, 2 deletions
diff --git a/libavfilter/Makefile b/libavfilter/Makefile
index d2a40c4c16..a15c3f102c 100644
--- a/libavfilter/Makefile
+++ b/libavfilter/Makefile
@@ -23,6 +23,7 @@ OBJS-$(CONFIG_FORMAT_FILTER) += vf_format.o
OBJS-$(CONFIG_HFLIP_FILTER) += vf_hflip.o
OBJS-$(CONFIG_NOFORMAT_FILTER) += vf_format.o
OBJS-$(CONFIG_NULL_FILTER) += vf_null.o
+OBJS-$(CONFIG_OCV_SMOOTH_FILTER) += vf_libopencv.o
OBJS-$(CONFIG_PAD_FILTER) += vf_pad.o
OBJS-$(CONFIG_PIXDESCTEST_FILTER) += vf_pixdesctest.o
OBJS-$(CONFIG_PIXELASPECT_FILTER) += vf_aspect.o
diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c
index 27442f6927..fb84968232 100644
--- a/libavfilter/allfilters.c
+++ b/libavfilter/allfilters.c
@@ -43,6 +43,7 @@ void avfilter_register_all(void)
REGISTER_FILTER (HFLIP, hflip, vf);
REGISTER_FILTER (NOFORMAT, noformat, vf);
REGISTER_FILTER (NULL, null, vf);
+ REGISTER_FILTER (OCV_SMOOTH, ocv_smooth, vf);
REGISTER_FILTER (PAD, pad, vf);
REGISTER_FILTER (PIXDESCTEST, pixdesctest, vf);
REGISTER_FILTER (PIXELASPECT, pixelaspect, vf);
diff --git a/libavfilter/avfilter.h b/libavfilter/avfilter.h
index 024c8b805d..7fbcbf2322 100644
--- a/libavfilter/avfilter.h
+++ b/libavfilter/avfilter.h
@@ -25,8 +25,8 @@
#include "libavutil/avutil.h"
#define LIBAVFILTER_VERSION_MAJOR 1
-#define LIBAVFILTER_VERSION_MINOR 38
-#define LIBAVFILTER_VERSION_MICRO 3
+#define LIBAVFILTER_VERSION_MINOR 39
+#define LIBAVFILTER_VERSION_MICRO 0
#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
LIBAVFILTER_VERSION_MINOR, \
diff --git a/libavfilter/vf_libopencv.c b/libavfilter/vf_libopencv.c
new file mode 100644
index 0000000000..63d5b61004
--- /dev/null
+++ b/libavfilter/vf_libopencv.c
@@ -0,0 +1,156 @@
+/*
+ * copyright Stefano Sabatini 2010
+ *
+ * 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
+ * libopencv wrapper functions
+ */
+
+#include "opencv/cv.h"
+#include "opencv/cxtypes.h"
+#include "avfilter.h"
+
+static void fill_iplimage_from_picref(IplImage *img, const AVFilterBufferRef *picref, enum PixelFormat pixfmt)
+{
+ IplImage *tmpimg;
+ int depth, channels_nb;
+
+ if (pixfmt == PIX_FMT_GRAY8) { depth = IPL_DEPTH_8U; channels_nb = 1; }
+ else if (pixfmt == PIX_FMT_BGRA) { depth = IPL_DEPTH_8U; channels_nb = 4; }
+ else if (pixfmt == PIX_FMT_BGR24) { depth = IPL_DEPTH_8U; channels_nb = 3; }
+ else return;
+
+ tmpimg = cvCreateImageHeader((CvSize){picref->video->w, picref->video->h}, depth, channels_nb);
+ *img = *tmpimg;
+ img->imageData = img->imageDataOrigin = picref->data[0];
+ img->dataOrder = IPL_DATA_ORDER_PIXEL;
+ img->origin = IPL_ORIGIN_TL;
+ img->widthStep = picref->linesize[0];
+}
+
+static void fill_picref_from_iplimage(AVFilterBufferRef *picref, const IplImage *img, enum PixelFormat pixfmt)
+{
+ picref->linesize[0] = img->widthStep;
+ picref->data[0] = img->imageData;
+}
+
+static int query_formats(AVFilterContext *ctx)
+{
+ static const enum PixelFormat pix_fmts[] = {
+ PIX_FMT_BGR24, PIX_FMT_BGRA, PIX_FMT_GRAY8, PIX_FMT_NONE
+ };
+
+ avfilter_set_common_formats(ctx, avfilter_make_format_list(pix_fmts));
+ return 0;
+}
+
+static void null_draw_slice(AVFilterLink *link, int y, int h, int slice_dir) { }
+
+#if CONFIG_OCV_SMOOTH_FILTER
+
+typedef struct {
+ int type;
+ int param1, param2;
+ double param3, param4;
+} SmoothContext;
+
+static av_cold int smooth_init(AVFilterContext *ctx, const char *args, void *opaque)
+{
+ SmoothContext *smooth = ctx->priv;
+ char type_str[128] = "gaussian";
+
+ smooth->param1 = 3;
+ smooth->param2 = 0;
+ smooth->param3 = 0.0;
+ smooth->param4 = 0.0;
+
+ if (args)
+ sscanf(args, "%127[^:]:%d:%d:%lf:%lf", type_str, &smooth->param1, &smooth->param2, &smooth->param3, &smooth->param4);
+
+ if (!strcmp(type_str, "blur" )) smooth->type = CV_BLUR;
+ else if (!strcmp(type_str, "blur_no_scale")) smooth->type = CV_BLUR_NO_SCALE;
+ else if (!strcmp(type_str, "median" )) smooth->type = CV_MEDIAN;
+ else if (!strcmp(type_str, "gaussian" )) smooth->type = CV_GAUSSIAN;
+ else if (!strcmp(type_str, "bilateral" )) smooth->type = CV_BILATERAL;
+ else {
+ av_log(ctx, AV_LOG_ERROR, "Smoothing type '%s' unknown\n.", type_str);
+ return AVERROR(EINVAL);
+ }
+
+ if (smooth->param1 < 0 || !(smooth->param1%2)) {
+ av_log(ctx, AV_LOG_ERROR,
+ "Invalid value '%d' for param1, it has to be a positive odd number\n",
+ smooth->param1);
+ return AVERROR(EINVAL);
+ }
+ if ((smooth->type == CV_BLUR || smooth->type == CV_BLUR_NO_SCALE || smooth->type == CV_GAUSSIAN) &&
+ (smooth->param2 < 0 || (smooth->param2 && !(smooth->param2%2)))) {
+ av_log(ctx, AV_LOG_ERROR,
+ "Invalid value '%d' for param2, it has to be zero or a positive odd number\n",
+ smooth->param2);
+ return AVERROR(EINVAL);
+ }
+
+ av_log(ctx, AV_LOG_INFO, "type:%s param1:%d param2:%d param3:%f param4:%f\n",
+ type_str, smooth->param1, smooth->param2, smooth->param3, smooth->param4);
+ return 0;
+}
+
+static void smooth_end_frame(AVFilterLink *inlink)
+{
+ SmoothContext *smooth = inlink->dst->priv;
+ AVFilterLink *outlink= inlink->dst->outputs[0];
+ AVFilterBufferRef *inpicref = inlink ->cur_buf;
+ AVFilterBufferRef *outpicref = outlink->out_buf;
+ IplImage inimg, outimg;
+
+ fill_iplimage_from_picref(&inimg , inpicref , inlink->format);
+ fill_iplimage_from_picref(&outimg, outpicref, inlink->format);
+ cvSmooth(&inimg, &outimg, smooth->type, smooth->param1, smooth->param2, smooth->param3, smooth->param4);
+ fill_picref_from_iplimage(outpicref, &outimg, inlink->format);
+
+ avfilter_unref_buffer(inpicref);
+ avfilter_draw_slice(outlink, 0, outlink->h, 1);
+ avfilter_end_frame(outlink);
+ avfilter_unref_buffer(outpicref);
+}
+
+AVFilter avfilter_vf_ocv_smooth = {
+ .name = "ocv_smooth",
+ .description = "Apply smooth transform using libopencv.",
+
+ .priv_size = sizeof(SmoothContext),
+
+ .query_formats = query_formats,
+ .init = smooth_init,
+
+ .inputs = (AVFilterPad[]) {{ .name = "default",
+ .type = AVMEDIA_TYPE_VIDEO,
+ .draw_slice = null_draw_slice,
+ .end_frame = smooth_end_frame,
+ .min_perms = AV_PERM_READ },
+ { .name = NULL}},
+
+ .outputs = (AVFilterPad[]) {{ .name = "default",
+ .type = AVMEDIA_TYPE_VIDEO, },
+ { .name = NULL}},
+};
+
+#endif /* CONFIG_OCV_SMOOTH_FILTER */