geometrictransform: Adds rotate element

Adds a new rotate element to geometrictransform. It still
needs some work. But this is a good starting point.

Based on patch from Bert Douglas <bertd tplogic com>

gst/geometrictransform/Makefile.am

@@ -9,6 +9,7 @@ libgstgeometrictransform_la_SOURCES = plugin.c \
                                       gstkaleidoscope.c \
                                       gstmarble.c \
                                       gstpinch.c \
+                                      gstrotate.c \
                                       gstsphere.c \
                                       gsttwirl.c \
                                       gstwaterripple.c \
@@ -39,6 +40,7 @@ noinst_HEADERS = gstgeometrictransform.h \
                  gstkaleidoscope.h \
                  gstmarble.h \
                  gstpinch.h \
+                 gstrotate.h \
                  gstsphere.h \
                  gsttwirl.h \
                  gstwaterripple.h \

gst/geometrictransform/gstrotate.c

@@ -0,0 +1,226 @@
+/*
+ * 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 "gstrotate.h"
+
+GST_DEBUG_CATEGORY_STATIC (gst_rotate_debug);
+#define GST_CAT_DEFAULT gst_rotate_debug
+
+enum
+{
+  PROP_0,
+  PROP_ANGLE
+};
+
+#define DEFAULT_ANGLE 0
+
+GST_BOILERPLATE (GstRotate, gst_rotate, GstGeometricTransform,
+    GST_TYPE_GEOMETRIC_TRANSFORM);
+
+static void
+gst_rotate_set_property (GObject * object, guint prop_id, const GValue * value,
+    GParamSpec * pspec)
+{
+  GstRotate *rotate;
+  GstGeometricTransform *gt;
+  gdouble v;
+
+  gt = GST_GEOMETRIC_TRANSFORM_CAST (object);
+  rotate = GST_ROTATE_CAST (object);
+
+  GST_OBJECT_LOCK (rotate);
+  switch (prop_id) {
+    case PROP_ANGLE:
+      v = g_value_get_double (value);
+      if (v != rotate->angle) {
+        rotate->angle = v;
+        gst_geometric_transform_set_need_remap (gt);
+      }
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+  GST_OBJECT_UNLOCK (rotate);
+}
+
+static void
+gst_rotate_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec)
+{
+  GstRotate *rotate;
+
+  rotate = GST_ROTATE_CAST (object);
+
+  switch (prop_id) {
+    case PROP_ANGLE:
+      g_value_set_double (value, rotate->angle);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+}
+
+/* Clean up */
+static void
+gst_rotate_finalize (GObject * obj)
+{
+  G_OBJECT_CLASS (parent_class)->finalize (obj);
+}
+
+/* GObject vmethod implementations */
+
+static void
+gst_rotate_base_init (gpointer gclass)
+{
+  GstElementClass *element_class = GST_ELEMENT_CLASS (gclass);
+
+  gst_element_class_set_details_simple (element_class,
+      "rotate",
+      "Transform/Effect/Video",
+      "Warps the picture into an arc shaped form",
+      "Thiago Santos<thiago.sousa.santos@collabora.co.uk>");
+}
+
+static gboolean
+rotate_map (GstGeometricTransform * gt, gint x, gint y, gdouble * in_x,
+    gdouble * in_y)
+{
+  GstRotate *rotate = GST_ROTATE_CAST (gt);
+  gint w, h;
+  gdouble cix, ciy, cox, coy;   /* centers, in/out x/y */
+  gdouble ai, ao, ar;           /* angles, in/out/rotate  (radians) */
+  gdouble r;                    /* radius */
+  gdouble xi, yi, xo, yo;       /* positions in/out x/y */
+
+  /* input and output image height and width */
+  w = gt->width;
+  h = gt->height;
+
+  /* our parameters */
+  ar = rotate->angle * M_PI / 180.0;    /* angle of rotation, degrees to radians */
+
+  /* get in and out centers */
+  cox = 0.5 * w;
+  coy = 0.5 * h;
+  cix = cox;
+  ciy = coy;
+
+  /* convert output image position to polar form */
+  xo = x - cox;
+  yo = y - coy;
+  ao = atan2 (yo, xo);
+  r = sqrt (xo * xo + yo * yo);
+
+  /* perform rotation backward to get input image rotation
+   * this seems wrong, but rotation from in-->out is counterclockwise */
+  ai = ao + ar;
+
+  /* back to rectangular for input image position */
+  xi = r * cos (ai);
+  yi = r * sin (ai);
+
+  /* restore center offset, return values to caller */
+  *in_x = xi + cix;
+  *in_y = yi + ciy;
+
+  GST_DEBUG_OBJECT (rotate, "Inversely mapped %d %d into %lf %lf",
+      x, y, *in_x, *in_y);
+
+  return TRUE;
+}
+
+static void
+gst_rotate_class_init (GstRotateClass * 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_rotate_finalize);
+  gobject_class->set_property = GST_DEBUG_FUNCPTR (gst_rotate_set_property);
+  gobject_class->get_property = GST_DEBUG_FUNCPTR (gst_rotate_get_property);
+
+  g_object_class_install_property (gobject_class, PROP_ANGLE,
+      g_param_spec_double ("angle", "angle",
+          "Angle at which the arc starts in radians",
+          -G_MAXDOUBLE, G_MAXDOUBLE, DEFAULT_ANGLE,
+          GST_PARAM_CONTROLLABLE | G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS));
+
+  gstgt_class->map_func = rotate_map;
+}
+
+static void
+gst_rotate_init (GstRotate * filter, GstRotateClass * gclass)
+{
+  filter->angle = DEFAULT_ANGLE;
+}
+
+gboolean
+gst_rotate_plugin_init (GstPlugin * plugin)
+{
+  GST_DEBUG_CATEGORY_INIT (gst_rotate_debug, "rotate", 0, "rotate");
+
+  return gst_element_register (plugin, "rotate", GST_RANK_NONE,
+      GST_TYPE_ROTATE);
+}

gst/geometrictransform/gstrotate.h

@@ -0,0 +1,87 @@
+/*
+ * 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_ROTATE_H__
+#define __GST_ROTATE_H__
+
+#include <gst/gst.h>
+#include "gstgeometrictransform.h"
+
+G_BEGIN_DECLS
+
+/* #defines don't like whitespacey bits */
+#define GST_TYPE_ROTATE \
+  (gst_rotate_get_type())
+#define GST_ROTATE(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_ROTATE,GstRotate))
+#define GST_ROTATE_CAST(obj) \
+  ((GstRotate *)(obj))
+#define GST_ROTATE_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_ROTATE,GstRotateClass))
+#define GST_IS_ROTATE(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_ROTATE))
+#define GST_IS_ROTATE_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_ROTATE))
+
+typedef struct _GstRotate      GstRotate;
+typedef struct _GstRotateClass GstRotateClass;
+
+struct _GstRotate
+{
+  GstGeometricTransform element;
+
+  gdouble angle;
+};
+
+struct _GstRotateClass
+{
+  GstGeometricTransformClass parent_class;
+};
+
+GType gst_rotate_get_type (void);
+
+gboolean gst_rotate_plugin_init (GstPlugin * plugin);
+
+G_END_DECLS
+
+#endif /* __GST_ROTATE_H__ */

gst/geometrictransform/plugin.c

@@ -26,6 +26,7 @@
 #include "gstkaleidoscope.h"
 #include "gstmarble.h"
 #include "gstpinch.h"
+#include "gstrotate.h"
 #include "gstsphere.h"
 #include "gsttwirl.h"
 #include "gstwaterripple.h"
@@ -54,6 +55,9 @@ plugin_init (GstPlugin * plugin)
   if (!gst_pinch_plugin_init (plugin))
     return FALSE;
 
+  if (!gst_rotate_plugin_init (plugin))
+    return FALSE;
+
   if (!gst_sphere_plugin_init (plugin))
     return FALSE;