From: Thiago Santos Date: Thu, 3 Jun 2010 02:55:41 +0000 (-0300) Subject: sphere: Adds new 'sphere' element to geometrictransform X-Git-Tag: 1.19.3~507^2~16928 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ed7461b589f0829686cbd4228c65cf6e16231ee7;p=platform%2Fupstream%2Fgstreamer.git sphere: Adds new 'sphere' element to geometrictransform Adds a new element to do 'sphere' effect into geometrictransform plugin --- diff --git a/gst/geometrictransform/Makefile.am b/gst/geometrictransform/Makefile.am index 9d50b50..d0350f7 100644 --- a/gst/geometrictransform/Makefile.am +++ b/gst/geometrictransform/Makefile.am @@ -7,6 +7,7 @@ libgstgeometrictransform_la_SOURCES = plugin.c \ gstcircle.c \ gstkaleidoscope.c \ gstpinch.c \ + gstsphere.c \ gsttwirl.c libgstgeometrictransform_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \ @@ -21,4 +22,5 @@ noinst_HEADERS = gstgeometrictransform.h \ gstcircle.h \ gstkaleidoscope.h \ gstpinch.h \ + gstsphere.h \ gsttwirl.h diff --git a/gst/geometrictransform/gstsphere.c b/gst/geometrictransform/gstsphere.c new file mode 100644 index 0000000..87d0d2a --- /dev/null +++ b/gst/geometrictransform/gstsphere.c @@ -0,0 +1,221 @@ +/* + * GStreamer + * Copyright (C) 2010 Thiago Santos + * + * 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 work on its java + * image editor and filters. The algorithms here were extracted from + * his code. + */ + + +#ifdef HAVE_CONFIG_H +# include +#endif + +#include +#include + +#include "gstsphere.h" + +GST_DEBUG_CATEGORY_STATIC (gst_sphere_debug); +#define GST_CAT_DEFAULT gst_sphere_debug + +enum +{ + PROP_0, + PROP_REFRACTION +}; + +#define DEFAULT_REFRACTION 1.5 + +GST_BOILERPLATE (GstSphere, gst_sphere, GstCircleGeometricTransform, + GST_TYPE_CIRCLE_GEOMETRIC_TRANSFORM); + +static void +gst_sphere_set_property (GObject * object, guint prop_id, const GValue * value, + GParamSpec * pspec) +{ + GstSphere *sphere; + + sphere = GST_SPHERE_CAST (object); + + switch (prop_id) { + case PROP_REFRACTION: + sphere->refraction = g_value_get_double (value); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +gst_sphere_get_property (GObject * object, guint prop_id, + GValue * value, GParamSpec * pspec) +{ + GstSphere *sphere; + + sphere = GST_SPHERE_CAST (object); + + switch (prop_id) { + case PROP_REFRACTION: + g_value_set_double (value, sphere->refraction); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +/* Clean up */ +static void +gst_sphere_finalize (GObject * obj) +{ + G_OBJECT_CLASS (parent_class)->finalize (obj); +} + +/* GObject vmethod implementations */ + +static void +gst_sphere_base_init (gpointer gclass) +{ + GstElementClass *element_class = GST_ELEMENT_CLASS (gclass); + + gst_element_class_set_details_simple (element_class, + "sphere", + "Transform/Effect/Video", + "Applies 'sphere' geometric transform to the image", + "Thiago Santos"); +} + +/* TODO we could have horizontal and vertical 'radius' */ +static gboolean +sphere_map (GstGeometricTransform * gt, gint x, gint y, gdouble * in_x, + gdouble * in_y) +{ + GstCircleGeometricTransform *cgt = GST_CIRCLE_GEOMETRIC_TRANSFORM_CAST (gt); + GstSphere *sphere = GST_SPHERE_CAST (gt); + gdouble dx, dy; + gdouble dx2, dy2; + + dx = x - cgt->precalc_x_center; + dy = y - cgt->precalc_y_center; + dx2 = dx * dx; + dy2 = dy * dy; + + if (dy2 >= + (cgt->precalc_radius2 - + (cgt->precalc_radius2 * dx2) / cgt->precalc_radius2)) { + *in_x = x; + *in_y = y; + } else { + gdouble r_refraction = 1.0 / sphere->refraction; + gdouble z; + gdouble z2; + gdouble angle; + gdouble angle1; + gdouble angle2; + + z = sqrt ((1.0 - dx2 / cgt->precalc_radius2 - + dy2 / cgt->precalc_radius2) * (cgt->precalc_radius2)); + z2 = z * z; + + /* x */ + angle = acos (dx / sqrt (dx2 + z2)); + angle1 = G_PI / 2 - angle; + angle2 = asin (sin (angle1) * r_refraction); + angle2 = G_PI / 2 - angle - angle2; + *in_x = x - tan (angle2) * z; + + /* y */ + angle = acos (dy / sqrt (dy2 + z2)); + angle1 = G_PI / 2 - angle; + angle2 = asin (sin (angle1) * r_refraction); + angle2 = G_PI / 2 - angle - angle2; + *in_y = y - tan (angle2) * z; + } + + GST_DEBUG_OBJECT (sphere, "Inversely mapped %d %d into %lf %lf", + x, y, *in_x, *in_y); + + return TRUE; +} + +static void +gst_sphere_class_init (GstSphereClass * 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_sphere_finalize); + gobject_class->set_property = GST_DEBUG_FUNCPTR (gst_sphere_set_property); + gobject_class->get_property = GST_DEBUG_FUNCPTR (gst_sphere_get_property); + + g_object_class_install_property (gobject_class, PROP_REFRACTION, + g_param_spec_double ("refraction", "refraction", + "refraction index", + -G_MAXDOUBLE, G_MAXDOUBLE, DEFAULT_REFRACTION, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + + gstgt_class->map_func = sphere_map; +} + +static void +gst_sphere_init (GstSphere * filter, GstSphereClass * gclass) +{ + filter->refraction = DEFAULT_REFRACTION; +} + +gboolean +gst_sphere_plugin_init (GstPlugin * plugin) +{ + GST_DEBUG_CATEGORY_INIT (gst_sphere_debug, "sphere", 0, "sphere"); + + return gst_element_register (plugin, "sphere", GST_RANK_NONE, + GST_TYPE_SPHERE); +} diff --git a/gst/geometrictransform/gstsphere.h b/gst/geometrictransform/gstsphere.h new file mode 100644 index 0000000..2a00c28 --- /dev/null +++ b/gst/geometrictransform/gstsphere.h @@ -0,0 +1,87 @@ +/* + * GStreamer + * Copyright (C) 2010 Thiago Santos + * + * 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_SPHERE_H__ +#define __GST_SPHERE_H__ + +#include +#include "gstcirclegeometrictransform.h" + +G_BEGIN_DECLS + +/* #defines don't like whitespacey bits */ +#define GST_TYPE_SPHERE \ + (gst_sphere_get_type()) +#define GST_SPHERE(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_SPHERE,GstSphere)) +#define GST_SPHERE_CAST(obj) \ + ((GstSphere *)(obj)) +#define GST_SPHERE_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_SPHERE,GstSphereClass)) +#define GST_IS_SPHERE(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_SPHERE)) +#define GST_IS_SPHERE_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_SPHERE)) + +typedef struct _GstSphere GstSphere; +typedef struct _GstSphereClass GstSphereClass; + +struct _GstSphere +{ + GstCircleGeometricTransform element; + + gdouble refraction; +}; + +struct _GstSphereClass +{ + GstCircleGeometricTransformClass parent_class; +}; + +GType gst_sphere_get_type (void); + +gboolean gst_sphere_plugin_init (GstPlugin * plugin); + +G_END_DECLS + +#endif /* __GST_SPHERE_H__ */ diff --git a/gst/geometrictransform/plugin.c b/gst/geometrictransform/plugin.c index e8cdb7e..e4568cb 100644 --- a/gst/geometrictransform/plugin.c +++ b/gst/geometrictransform/plugin.c @@ -24,6 +24,7 @@ #include "gstcircle.h" #include "gstkaleidoscope.h" #include "gstpinch.h" +#include "gstsphere.h" #include "gsttwirl.h" static gboolean @@ -38,6 +39,9 @@ plugin_init (GstPlugin * plugin) if (!gst_pinch_plugin_init (plugin)) return FALSE; + if (!gst_sphere_plugin_init (plugin)) + return FALSE; + if (!gst_twirl_plugin_init (plugin)) return FALSE;