kaleidoscope: Adds new element 'kaleidoscope'

Adds new kaleidoscope element to geometrictransform plugin

gst/geometrictransform/Makefile.am

@@ -3,6 +3,8 @@ plugin_LTLIBRARIES = libgstgeometrictransform.la
 libgstgeometrictransform_la_SOURCES = plugin.c \
                                       gstgeometrictransform.c \
                                       gstcirclegeometrictransform.c \
+                                      geometricmath.c \
+                                      gstkaleidoscope.c \
                                       gstpinch.c \
                                       gsttwirl.c
 
@@ -14,5 +16,7 @@ libgstgeometrictransform_la_LIBTOOLFLAGS = --tag=disable-static
 
 noinst_HEADERS = gstgeometrictransform.h \
                  gstcirclegeometrictransform.h \
+                 geometricmath.h \
+                 gstkaleidoscope.h \
                  gstpinch.h \
                  gsttwirl.h

gst/geometrictransform/geometricmath.c

@@ -0,0 +1,75 @@
+/*
+ * GStreamer
+ * Copyright (C) 2010 Thiago Santos <thiago.sousa.santos@collabora.co.uk>
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Alternatively, the contents of this file may be used under the
+ * GNU Lesser General Public License Version 2.1 (the "LGPL"), in
+ * which case the following provisions apply instead of the ones
+ * mentioned above:
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+/*
+ * Thanks to Jerry Huxtable <http://www.jhlabs.com> work on its java
+ * image editor and filters. The algorithms here were extracted from
+ * his code.
+ */
+
+#include "geometricmath.h"
+
+/*
+ * This differs from the % operator with respect to negative numbers
+ */
+static gdouble
+mod_float (gdouble a, gdouble b)
+{
+  gint n = (gint) (a / b);
+
+  a -= n * b;
+  if (a < 0)
+    return a + b;
+  return a;
+}
+
+/**
+ * Returns a repeating triangle shape in the range 0..1 with wavelength 1.0
+ */
+gdouble
+geometric_math_triangle (gdouble x)
+{
+  gdouble r = mod_float (x, 1.0);
+
+  return 2.0 * (r < 0.5 ? r : 1 - r);
+}

gst/geometrictransform/geometricmath.h

@@ -0,0 +1,61 @@
+/*
+ * GStreamer
+ * Copyright (C) 2010 Thiago Santos <thiago.sousa.santos@collabora.co.uk>
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Alternatively, the contents of this file may be used under the
+ * GNU Lesser General Public License Version 2.1 (the "LGPL"), in
+ * which case the following provisions apply instead of the ones
+ * mentioned above:
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+/*
+ * Thanks to Jerry Huxtable <http://www.jhlabs.com> work on its java
+ * image editor and filters. The algorithms here were extracted from
+ * his code.
+ */
+
+#ifndef __GEOMETRIC_MATH_H__
+#define __GEOMETRIC_MATH_H__
+
+#include <gst/gst.h>
+
+G_BEGIN_DECLS
+
+gdouble geometric_math_triangle (gdouble x);
+
+G_END_DECLS
+
+#endif /* __GEOMETRIC_MATH_H__ */

gst/geometrictransform/gstkaleidoscope.c

@@ -0,0 +1,235 @@
+/*
+ * GStreamer
+ * Copyright (C) 2010 Thiago Santos <thiago.sousa.santos@collabora.co.uk>
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Alternatively, the contents of this file may be used under the
+ * GNU Lesser General Public License Version 2.1 (the "LGPL"), in
+ * which case the following provisions apply instead of the ones
+ * mentioned above:
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+/*
+ * Thanks to Jerry Huxtable <http://www.jhlabs.com> work on its java
+ * image editor and filters. The algorithms here were extracted from
+ * his code.
+ */
+
+
+#ifdef HAVE_CONFIG_H
+#  include <config.h>
+#endif
+
+#include <gst/gst.h>
+#include <math.h>
+
+#include "geometricmath.h"
+#include "gstkaleidoscope.h"
+
+GST_DEBUG_CATEGORY_STATIC (gst_kaleidoscope_debug);
+#define GST_CAT_DEFAULT gst_kaleidoscope_debug
+
+enum
+{
+  PROP_0,
+  PROP_ANGLE,
+  PROP_ANGLE2,
+  PROP_SIDES
+};
+
+#define DEFAULT_ANGLE 0
+#define DEFAULT_ANGLE2 0
+#define DEFAULT_SIDES 3
+
+GST_BOILERPLATE (GstKaleidoscope, gst_kaleidoscope, GstCircleGeometricTransform,
+    GST_TYPE_CIRCLE_GEOMETRIC_TRANSFORM);
+
+static void
+gst_kaleidoscope_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec)
+{
+  GstKaleidoscope *kaleidoscope;
+
+  kaleidoscope = GST_KALEIDOSCOPE_CAST (object);
+
+  switch (prop_id) {
+    case PROP_ANGLE:
+      kaleidoscope->angle = g_value_get_double (value);
+      break;
+    case PROP_ANGLE2:
+      kaleidoscope->angle2 = g_value_get_double (value);
+      break;
+    case PROP_SIDES:
+      kaleidoscope->sides = g_value_get_int (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+static void
+gst_kaleidoscope_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec)
+{
+  GstKaleidoscope *kaleidoscope;
+
+  kaleidoscope = GST_KALEIDOSCOPE_CAST (object);
+
+  switch (prop_id) {
+    case PROP_ANGLE:
+      g_value_set_double (value, kaleidoscope->angle);
+      break;
+    case PROP_ANGLE2:
+      g_value_set_double (value, kaleidoscope->angle2);
+      break;
+    case PROP_SIDES:
+      g_value_set_int (value, kaleidoscope->sides);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+/* Clean up */
+static void
+gst_kaleidoscope_finalize (GObject * obj)
+{
+  G_OBJECT_CLASS (parent_class)->finalize (obj);
+}
+
+/* GObject vmethod implementations */
+
+static void
+gst_kaleidoscope_base_init (gpointer gclass)
+{
+  GstElementClass *element_class = GST_ELEMENT_CLASS (gclass);
+
+  gst_element_class_set_details_simple (element_class,
+      "kaleidoscope",
+      "Transform/Effect/Video",
+      "Applies 'kaleidoscope' geometric transform to the image",
+      "Thiago Santos<thiago.sousa.santos@collabora.co.uk>");
+}
+
+static gboolean
+kaleidoscope_map (GstGeometricTransform * gt, gint x, gint y, gdouble * in_x,
+    gdouble * in_y)
+{
+  GstCircleGeometricTransform *cgt = GST_CIRCLE_GEOMETRIC_TRANSFORM_CAST (gt);
+  GstKaleidoscope *kaleidoscope = GST_KALEIDOSCOPE_CAST (gt);
+  gdouble dx, dy;
+  gdouble distance;
+  gdouble theta;
+
+  dx = x - cgt->precalc_x_center;
+  dy = y - cgt->precalc_y_center;
+  distance = sqrt (dx * dx + dy * dy);
+  theta = atan2 (dy, dx) - kaleidoscope->angle - kaleidoscope->angle2;
+
+  theta = geometric_math_triangle (theta / G_PI * kaleidoscope->sides * 0.5);
+
+  if (cgt->radius != 0) {
+    gdouble radiusc = cgt->radius / cos (theta);
+
+    distance = radiusc * geometric_math_triangle (distance / radiusc);
+  }
+  theta += kaleidoscope->angle;
+
+  *in_x = cgt->precalc_x_center + distance * cos (theta);
+  *in_y = cgt->precalc_y_center + distance * sin (theta);
+
+  *in_x = CLAMP (*in_x, 0, gt->width - 1);
+  *in_y = CLAMP (*in_y, 0, gt->height - 1);
+  GST_DEBUG_OBJECT (kaleidoscope, "Inversely mapped %d %d into %lf %lf",
+      x, y, *in_x, *in_y);
+
+  return TRUE;
+}
+
+static void
+gst_kaleidoscope_class_init (GstKaleidoscopeClass * klass)
+{
+  GObjectClass *gobject_class;
+  GstGeometricTransformClass *gstgt_class;
+
+  gobject_class = (GObjectClass *) klass;
+  gstgt_class = (GstGeometricTransformClass *) klass;
+
+  parent_class = g_type_class_peek_parent (klass);
+
+  gobject_class->finalize = GST_DEBUG_FUNCPTR (gst_kaleidoscope_finalize);
+  gobject_class->set_property =
+      GST_DEBUG_FUNCPTR (gst_kaleidoscope_set_property);
+  gobject_class->get_property =
+      GST_DEBUG_FUNCPTR (gst_kaleidoscope_get_property);
+
+
+  g_object_class_install_property (gobject_class, PROP_ANGLE,
+      g_param_spec_double ("angle", "angle",
+          "primary angle in radians of the kaleidoscope effect",
+          -G_MAXDOUBLE, G_MAXDOUBLE, DEFAULT_ANGLE,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+  g_object_class_install_property (gobject_class, PROP_ANGLE2,
+      g_param_spec_double ("angle2", "angle2",
+          "secondary angle in radians of the kaleidoscope effect",
+          -G_MAXDOUBLE, G_MAXDOUBLE, DEFAULT_ANGLE,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+  g_object_class_install_property (gobject_class, PROP_SIDES,
+      g_param_spec_int ("sides", "sides", "number of sides",
+          0, G_MAXINT, DEFAULT_SIDES,
+          G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+  gstgt_class->map_func = kaleidoscope_map;
+}
+
+static void
+gst_kaleidoscope_init (GstKaleidoscope * filter, GstKaleidoscopeClass * gclass)
+{
+  filter->angle = DEFAULT_ANGLE;
+  filter->angle2 = DEFAULT_ANGLE2;
+  filter->sides = DEFAULT_SIDES;
+}
+
+gboolean
+gst_kaleidoscope_plugin_init (GstPlugin * plugin)
+{
+  GST_DEBUG_CATEGORY_INIT (gst_kaleidoscope_debug, "kaleidoscope", 0,
+      "kaleidoscope");
+
+  return gst_element_register (plugin, "kaleidoscope", GST_RANK_NONE,
+      GST_TYPE_KALEIDOSCOPE);
+}

gst/geometrictransform/gstkaleidoscope.h

@@ -0,0 +1,89 @@
+/*
+ * GStreamer
+ * Copyright (C) 2010 Thiago Santos <thiago.sousa.santos@collabora.co.uk>
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Alternatively, the contents of this file may be used under the
+ * GNU Lesser General Public License Version 2.1 (the "LGPL"), in
+ * which case the following provisions apply instead of the ones
+ * mentioned above:
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __GST_KALEIDOSCOPE_H__
+#define __GST_KALEIDOSCOPE_H__
+
+#include <gst/gst.h>
+#include "gstcirclegeometrictransform.h"
+
+G_BEGIN_DECLS
+
+/* #defines don't like whitespacey bits */
+#define GST_TYPE_KALEIDOSCOPE \
+  (gst_kaleidoscope_get_type())
+#define GST_KALEIDOSCOPE(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_KALEIDOSCOPE,GstKaleidoscope))
+#define GST_KALEIDOSCOPE_CAST(obj) \
+  ((GstKaleidoscope *)(obj))
+#define GST_KALEIDOSCOPE_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_KALEIDOSCOPE,GstKaleidoscopeClass))
+#define GST_IS_KALEIDOSCOPE(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_KALEIDOSCOPE))
+#define GST_IS_KALEIDOSCOPE_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_KALEIDOSCOPE))
+
+typedef struct _GstKaleidoscope      GstKaleidoscope;
+typedef struct _GstKaleidoscopeClass GstKaleidoscopeClass;
+
+struct _GstKaleidoscope
+{
+  GstCircleGeometricTransform element;
+
+  gdouble angle;
+  gdouble angle2;
+  gint sides;
+};
+
+struct _GstKaleidoscopeClass 
+{
+  GstCircleGeometricTransformClass parent_class;
+};
+
+GType gst_kaleidoscope_get_type (void);
+
+gboolean gst_kaleidoscope_plugin_init (GstPlugin * plugin);
+
+G_END_DECLS
+
+#endif /* __GST_KALEIDOSCOPE_H__ */

gst/geometrictransform/plugin.c

@@ -21,12 +21,16 @@
 #include "config.h"
 #endif
 
+#include "gstkaleidoscope.h"
 #include "gstpinch.h"
 #include "gsttwirl.h"
 
 static gboolean
 plugin_init (GstPlugin * plugin)
 {
+  if (!gst_kaleidoscope_plugin_init (plugin))
+    return FALSE;
+
   if (!gst_pinch_plugin_init (plugin))
     return FALSE;