diff options
| -rw-r--r-- | gst/geometrictransform/Makefile.am | 2 | ||||
| -rw-r--r-- | gst/geometrictransform/geometricmath.c | 2 | ||||
| -rw-r--r-- | gst/geometrictransform/geometricmath.h | 1 | ||||
| -rw-r--r-- | gst/geometrictransform/gstcircle.c | 227 | ||||
| -rw-r--r-- | gst/geometrictransform/gstcircle.h | 89 | ||||
| -rw-r--r-- | gst/geometrictransform/plugin.c | 4 |
6 files changed, 324 insertions, 1 deletions
diff --git a/gst/geometrictransform/Makefile.am b/gst/geometrictransform/Makefile.am index 58174107d..9d50b503b 100644 --- a/gst/geometrictransform/Makefile.am +++ b/gst/geometrictransform/Makefile.am @@ -4,6 +4,7 @@ libgstgeometrictransform_la_SOURCES = plugin.c \ gstgeometrictransform.c \ gstcirclegeometrictransform.c \ geometricmath.c \ + gstcircle.c \ gstkaleidoscope.c \ gstpinch.c \ gsttwirl.c @@ -17,6 +18,7 @@ libgstgeometrictransform_la_LIBTOOLFLAGS = --tag=disable-static noinst_HEADERS = gstgeometrictransform.h \ gstcirclegeometrictransform.h \ geometricmath.h \ + gstcircle.h \ gstkaleidoscope.h \ gstpinch.h \ gsttwirl.h diff --git a/gst/geometrictransform/geometricmath.c b/gst/geometrictransform/geometricmath.c index 4f49b5c15..3dc0db9ca 100644 --- a/gst/geometrictransform/geometricmath.c +++ b/gst/geometrictransform/geometricmath.c @@ -52,7 +52,7 @@ /* * This differs from the % operator with respect to negative numbers */ -static gdouble +gdouble mod_float (gdouble a, gdouble b) { gint n = (gint) (a / b); diff --git a/gst/geometrictransform/geometricmath.h b/gst/geometrictransform/geometricmath.h index fbca501d7..41e9a1244 100644 --- a/gst/geometrictransform/geometricmath.h +++ b/gst/geometrictransform/geometricmath.h @@ -54,6 +54,7 @@ G_BEGIN_DECLS +gdouble mod_float (gdouble a, gdouble b); gdouble geometric_math_triangle (gdouble x); G_END_DECLS diff --git a/gst/geometrictransform/gstcircle.c b/gst/geometrictransform/gstcircle.c new file mode 100644 index 000000000..31c5d4736 --- /dev/null +++ b/gst/geometrictransform/gstcircle.c @@ -0,0 +1,227 @@ +/* + * 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 "gstcircle.h" + +GST_DEBUG_CATEGORY_STATIC (gst_circle_debug); +#define GST_CAT_DEFAULT gst_circle_debug + +enum +{ + PROP_0, + PROP_ANGLE, + PROP_HEIGHT, + PROP_SPREAD_ANGLE +}; + +#define DEFAULT_ANGLE 0 +#define DEFAULT_HEIGHT 20 +#define DEFAULT_SPREAD_ANGLE G_PI + +GST_BOILERPLATE (GstCircle, gst_circle, GstCircleGeometricTransform, + GST_TYPE_CIRCLE_GEOMETRIC_TRANSFORM); + +static void +gst_circle_set_property (GObject * object, guint prop_id, const GValue * value, + GParamSpec * pspec) +{ + GstCircle *circle; + + circle = GST_CIRCLE_CAST (object); + + switch (prop_id) { + case PROP_ANGLE: + circle->angle = g_value_get_double (value); + break; + case PROP_SPREAD_ANGLE: + circle->spread_angle = g_value_get_double (value); + break; + case PROP_HEIGHT: + circle->height = g_value_get_int (value); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +gst_circle_get_property (GObject * object, guint prop_id, + GValue * value, GParamSpec * pspec) +{ + GstCircle *circle; + + circle = GST_CIRCLE_CAST (object); + + switch (prop_id) { + case PROP_ANGLE: + g_value_set_double (value, circle->angle); + break; + case PROP_SPREAD_ANGLE: + g_value_set_double (value, circle->spread_angle); + break; + case PROP_HEIGHT: + g_value_set_int (value, circle->height); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +/* Clean up */ +static void +gst_circle_finalize (GObject * obj) +{ + G_OBJECT_CLASS (parent_class)->finalize (obj); +} + +/* GObject vmethod implementations */ + +static void +gst_circle_base_init (gpointer gclass) +{ + GstElementClass *element_class = GST_ELEMENT_CLASS (gclass); + + gst_element_class_set_details_simple (element_class, + "circle", + "Transform/Effect/Video", + "Applies 'circle' geometric transform to the image", + "Thiago Santos<thiago.sousa.santos@collabora.co.uk>"); +} + +static gboolean +circle_map (GstGeometricTransform * gt, gint x, gint y, gdouble * in_x, + gdouble * in_y) +{ + GstCircleGeometricTransform *cgt = GST_CIRCLE_GEOMETRIC_TRANSFORM_CAST (gt); + GstCircle *circle = GST_CIRCLE_CAST (gt); + gdouble distance; + gdouble dx, dy; + gdouble theta; + + dx = x - cgt->precalc_x_center; + dy = y - cgt->precalc_y_center; + distance = sqrt (dx * dx + dy * dy); + theta = atan2 (-dy, -dx) + circle->angle; + + theta = mod_float (theta, 2 * G_PI); + + *in_x = gt->width * theta / (circle->spread_angle + 0.0001); + *in_y = + gt->height * (1 - (distance - cgt->radius) / (circle->height + 0.0001)); + + *in_x = CLAMP (*in_x, 0, gt->width - 1); + *in_y = CLAMP (*in_y, 0, gt->height - 1); + GST_DEBUG_OBJECT (circle, "Inversely mapped %d %d into %lf %lf", + x, y, *in_x, *in_y); + + return TRUE; +} + +static void +gst_circle_class_init (GstCircleClass * 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_circle_finalize); + gobject_class->set_property = GST_DEBUG_FUNCPTR (gst_circle_set_property); + gobject_class->get_property = GST_DEBUG_FUNCPTR (gst_circle_get_property); + + g_object_class_install_property (gobject_class, PROP_ANGLE, + g_param_spec_double ("angle", "angle", + "angle", + -G_MAXDOUBLE, G_MAXDOUBLE, DEFAULT_ANGLE, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_object_class_install_property (gobject_class, PROP_SPREAD_ANGLE, + g_param_spec_double ("spread-angle", "spread angle", + "spread angle", + -G_MAXDOUBLE, G_MAXDOUBLE, DEFAULT_SPREAD_ANGLE, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_object_class_install_property (gobject_class, PROP_HEIGHT, + g_param_spec_int ("height", "height", + "height", + 0, G_MAXINT, DEFAULT_HEIGHT, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + + gstgt_class->map_func = circle_map; +} + +static void +gst_circle_init (GstCircle * filter, GstCircleClass * gclass) +{ + filter->angle = DEFAULT_ANGLE; + filter->spread_angle = DEFAULT_SPREAD_ANGLE; + filter->height = DEFAULT_HEIGHT; +} + +gboolean +gst_circle_plugin_init (GstPlugin * plugin) +{ + GST_DEBUG_CATEGORY_INIT (gst_circle_debug, "circle", 0, "circle"); + + return gst_element_register (plugin, "circle", GST_RANK_NONE, + GST_TYPE_CIRCLE); +} diff --git a/gst/geometrictransform/gstcircle.h b/gst/geometrictransform/gstcircle.h new file mode 100644 index 000000000..e35c57e55 --- /dev/null +++ b/gst/geometrictransform/gstcircle.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_CIRCLE_H__ +#define __GST_CIRCLE_H__ + +#include <gst/gst.h> +#include "gstcirclegeometrictransform.h" + +G_BEGIN_DECLS + +/* #defines don't like whitespacey bits */ +#define GST_TYPE_CIRCLE \ + (gst_circle_get_type()) +#define GST_CIRCLE(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_CIRCLE,GstCircle)) +#define GST_CIRCLE_CAST(obj) \ + ((GstCircle *)(obj)) +#define GST_CIRCLE_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_CIRCLE,GstCircleClass)) +#define GST_IS_CIRCLE(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_CIRCLE)) +#define GST_IS_CIRCLE_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_CIRCLE)) + +typedef struct _GstCircle GstCircle; +typedef struct _GstCircleClass GstCircleClass; + +struct _GstCircle +{ + GstCircleGeometricTransform element; + + gdouble angle; + gdouble spread_angle; + gint height; +}; + +struct _GstCircleClass +{ + GstCircleGeometricTransformClass parent_class; +}; + +GType gst_circle_get_type (void); + +gboolean gst_circle_plugin_init (GstPlugin * plugin); + +G_END_DECLS + +#endif /* __GST_CIRCLE_H__ */ diff --git a/gst/geometrictransform/plugin.c b/gst/geometrictransform/plugin.c index f63e26d88..e8cdb7e3d 100644 --- a/gst/geometrictransform/plugin.c +++ b/gst/geometrictransform/plugin.c @@ -21,6 +21,7 @@ #include "config.h" #endif +#include "gstcircle.h" #include "gstkaleidoscope.h" #include "gstpinch.h" #include "gsttwirl.h" @@ -28,6 +29,9 @@ static gboolean plugin_init (GstPlugin * plugin) { + if (!gst_circle_plugin_init (plugin)) + return FALSE; + if (!gst_kaleidoscope_plugin_init (plugin)) return FALSE; |