From 213277cc021718b0c35c0568b7a285e9082212c4 Mon Sep 17 00:00:00 2001 From: Thiago Santos Date: Thu, 3 Jun 2010 00:24:50 -0300 Subject: [PATCH] waterripple: Adds new waterripple element to geometrictransofmr Adds an water ripple distortion element to geometrictransform --- gst/geometrictransform/Makefile.am | 6 +- gst/geometrictransform/gstwaterripple.c | 232 ++++++++++++++++++++++++ gst/geometrictransform/gstwaterripple.h | 89 +++++++++ gst/geometrictransform/plugin.c | 4 + 4 files changed, 329 insertions(+), 2 deletions(-) create mode 100644 gst/geometrictransform/gstwaterripple.c create mode 100644 gst/geometrictransform/gstwaterripple.h diff --git a/gst/geometrictransform/Makefile.am b/gst/geometrictransform/Makefile.am index d0350f7cd0..3f10a59a17 100644 --- a/gst/geometrictransform/Makefile.am +++ b/gst/geometrictransform/Makefile.am @@ -8,7 +8,8 @@ libgstgeometrictransform_la_SOURCES = plugin.c \ gstkaleidoscope.c \ gstpinch.c \ gstsphere.c \ - gsttwirl.c + gsttwirl.c \ + gstwaterripple.c libgstgeometrictransform_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \ $(GST_PLUGINS_BASE_CFLAGS) @@ -23,4 +24,5 @@ noinst_HEADERS = gstgeometrictransform.h \ gstkaleidoscope.h \ gstpinch.h \ gstsphere.h \ - gsttwirl.h + gsttwirl.h \ + gstwaterripple.h diff --git a/gst/geometrictransform/gstwaterripple.c b/gst/geometrictransform/gstwaterripple.c new file mode 100644 index 0000000000..bf65eba63c --- /dev/null +++ b/gst/geometrictransform/gstwaterripple.c @@ -0,0 +1,232 @@ +/* + * 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 "gstwaterripple.h" + +GST_DEBUG_CATEGORY_STATIC (gst_water_ripple_debug); +#define GST_CAT_DEFAULT gst_water_ripple_debug + +enum +{ + PROP_0, + PROP_AMPLITUDE, + PROP_PHASE, + PROP_WAVELENGTH +}; + +#define DEFAULT_AMPLITUDE 10.0 +#define DEFAULT_PHASE 0.0 +#define DEFAULT_WAVELENGTH 16.0 + +GST_BOILERPLATE (GstWaterRipple, gst_water_ripple, GstCircleGeometricTransform, + GST_TYPE_CIRCLE_GEOMETRIC_TRANSFORM); + +static void +gst_water_ripple_set_property (GObject * object, guint prop_id, + const GValue * value, GParamSpec * pspec) +{ + GstWaterRipple *water_ripple; + + water_ripple = GST_WATER_RIPPLE_CAST (object); + + switch (prop_id) { + case PROP_AMPLITUDE: + water_ripple->amplitude = g_value_get_double (value); + break; + case PROP_PHASE: + water_ripple->phase = g_value_get_double (value); + break; + case PROP_WAVELENGTH: + water_ripple->wavelength = g_value_get_double (value); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +static void +gst_water_ripple_get_property (GObject * object, guint prop_id, + GValue * value, GParamSpec * pspec) +{ + GstWaterRipple *water_ripple; + + water_ripple = GST_WATER_RIPPLE_CAST (object); + + switch (prop_id) { + case PROP_AMPLITUDE: + g_value_set_double (value, water_ripple->amplitude); + break; + case PROP_PHASE: + g_value_set_double (value, water_ripple->phase); + break; + case PROP_WAVELENGTH: + g_value_set_double (value, water_ripple->wavelength); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } +} + +/* Clean up */ +static void +gst_water_ripple_finalize (GObject * obj) +{ + G_OBJECT_CLASS (parent_class)->finalize (obj); +} + +/* GObject vmethod implementations */ + +static void +gst_water_ripple_base_init (gpointer gclass) +{ + GstElementClass *element_class = GST_ELEMENT_CLASS (gclass); + + gst_element_class_set_details_simple (element_class, + "waterripple", + "Transform/Effect/Video", + "Applies 'water_ripple' geometric transform to the image", + "Thiago Santos"); +} + +static gboolean +water_ripple_map (GstGeometricTransform * gt, gint x, gint y, gdouble * in_x, + gdouble * in_y) +{ + GstCircleGeometricTransform *cgt = GST_CIRCLE_GEOMETRIC_TRANSFORM_CAST (gt); + GstWaterRipple *water = GST_WATER_RIPPLE_CAST (gt); + gdouble distance; + gdouble dx, dy; + + dx = x - cgt->precalc_x_center; + dy = y - cgt->precalc_y_center; + distance = dx * dx + dy * dy; + + if (distance > cgt->precalc_radius2) { + *in_x = x; + *in_y = y; + } else { + gdouble d = sqrt (distance); + gdouble amount = + water->amplitude * sin (d / water->wavelength * G_PI * 2 - + water->phase); + + amount *= (cgt->radius - d) / cgt->radius; + if (d != 0) + amount *= water->wavelength / d; + *in_x = x + dx * amount; + *in_y = y + dy * amount; + } + + + GST_DEBUG_OBJECT (water, "Inversely mapped %d %d into %lf %lf", + x, y, *in_x, *in_y); + + return TRUE; +} + +static void +gst_water_ripple_class_init (GstWaterRippleClass * 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_water_ripple_finalize); + gobject_class->set_property = + GST_DEBUG_FUNCPTR (gst_water_ripple_set_property); + gobject_class->get_property = + GST_DEBUG_FUNCPTR (gst_water_ripple_get_property); + + g_object_class_install_property (gobject_class, PROP_AMPLITUDE, + g_param_spec_double ("amplitude", "amplitude", "amplitude", + -G_MAXDOUBLE, G_MAXDOUBLE, DEFAULT_AMPLITUDE, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_object_class_install_property (gobject_class, PROP_PHASE, + g_param_spec_double ("phase", "phase", "phase", + -G_MAXDOUBLE, G_MAXDOUBLE, DEFAULT_PHASE, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + g_object_class_install_property (gobject_class, PROP_WAVELENGTH, + g_param_spec_double ("wavelength", "wavelength", "wavelength", + -G_MAXDOUBLE, G_MAXDOUBLE, DEFAULT_WAVELENGTH, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); + + gstgt_class->map_func = water_ripple_map; +} + +static void +gst_water_ripple_init (GstWaterRipple * filter, GstWaterRippleClass * gclass) +{ + filter->amplitude = DEFAULT_AMPLITUDE; + filter->phase = DEFAULT_PHASE; + filter->wavelength = DEFAULT_WAVELENGTH; +} + +gboolean +gst_water_ripple_plugin_init (GstPlugin * plugin) +{ + GST_DEBUG_CATEGORY_INIT (gst_water_ripple_debug, "waterripple", 0, + "waterripple"); + + return gst_element_register (plugin, "waterripple", GST_RANK_NONE, + GST_TYPE_WATER_RIPPLE); +} diff --git a/gst/geometrictransform/gstwaterripple.h b/gst/geometrictransform/gstwaterripple.h new file mode 100644 index 0000000000..58f370eca8 --- /dev/null +++ b/gst/geometrictransform/gstwaterripple.h @@ -0,0 +1,89 @@ +/* + * 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_WATER_RIPPLE_H__ +#define __GST_WATER_RIPPLE_H__ + +#include +#include "gstcirclegeometrictransform.h" + +G_BEGIN_DECLS + +/* #defines don't like whitespacey bits */ +#define GST_TYPE_WATER_RIPPLE \ + (gst_water_ripple_get_type()) +#define GST_WATER_RIPPLE(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_WATER_RIPPLE,GstWaterRipple)) +#define GST_WATER_RIPPLE_CAST(obj) \ + ((GstWaterRipple *)(obj)) +#define GST_WATER_RIPPLE_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_WATER_RIPPLE,GstWaterRippleClass)) +#define GST_IS_WATER_RIPPLE(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_WATER_RIPPLE)) +#define GST_IS_WATER_RIPPLE_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_WATER_RIPPLE)) + +typedef struct _GstWaterRipple GstWaterRipple; +typedef struct _GstWaterRippleClass GstWaterRippleClass; + +struct _GstWaterRipple +{ + GstCircleGeometricTransform element; + + gdouble phase; + gdouble amplitude; + gdouble wavelength; +}; + +struct _GstWaterRippleClass +{ + GstCircleGeometricTransformClass parent_class; +}; + +GType gst_water_ripple_get_type (void); + +gboolean gst_water_ripple_plugin_init (GstPlugin * plugin); + +G_END_DECLS + +#endif /* __GST_WATER_RIPPLE_H__ */ diff --git a/gst/geometrictransform/plugin.c b/gst/geometrictransform/plugin.c index e4568cbc24..2d59d562f2 100644 --- a/gst/geometrictransform/plugin.c +++ b/gst/geometrictransform/plugin.c @@ -26,6 +26,7 @@ #include "gstpinch.h" #include "gstsphere.h" #include "gsttwirl.h" +#include "gstwaterripple.h" static gboolean plugin_init (GstPlugin * plugin) @@ -45,6 +46,9 @@ plugin_init (GstPlugin * plugin) if (!gst_twirl_plugin_init (plugin)) return FALSE; + if (!gst_water_ripple_plugin_init (plugin)) + return FALSE; + return TRUE; }