diff --git a/gst/geometrictransform/Makefile.am b/gst/geometrictransform/Makefile.am index c6a8ac7148..5c6d365f9a 100644 --- a/gst/geometrictransform/Makefile.am +++ b/gst/geometrictransform/Makefile.am @@ -12,7 +12,8 @@ libgstgeometrictransform_la_SOURCES = plugin.c \ gstsphere.c \ gsttwirl.c \ gstwaterripple.c \ - gststretch.c + gststretch.c \ + gstbulge.c libgstgeometrictransform_la_CFLAGS = $(GST_CFLAGS) $(GST_BASE_CFLAGS) \ $(GST_PLUGINS_BASE_CFLAGS) \ @@ -37,4 +38,5 @@ noinst_HEADERS = gstgeometrictransform.h \ gstsphere.h \ gsttwirl.h \ gstwaterripple.h \ - gststretch.h + gststretch.h \ + gstbulge.h diff --git a/gst/geometrictransform/gstbulge.c b/gst/geometrictransform/gstbulge.c new file mode 100644 index 0000000000..13476e664e --- /dev/null +++ b/gst/geometrictransform/gstbulge.c @@ -0,0 +1,149 @@ +/* + * GStreamer + * Copyright (C) 2010 Filippo Argiolas + * + * 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. + */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +#include +#include + +#include "gstbulge.h" +#include "geometricmath.h" + +GST_DEBUG_CATEGORY_STATIC (gst_bulge_debug); +#define GST_CAT_DEFAULT gst_bulge_debug + +GST_BOILERPLATE (GstBulge, gst_bulge, GstCircleGeometricTransform, + GST_TYPE_CIRCLE_GEOMETRIC_TRANSFORM); + +/* Clean up */ +static void +gst_bulge_finalize (GObject * obj) +{ + G_OBJECT_CLASS (parent_class)->finalize (obj); +} + +/* GObject vmethod implementations */ + +static void +gst_bulge_base_init (gpointer gclass) +{ + GstElementClass *element_class = GST_ELEMENT_CLASS (gclass); + + gst_element_class_set_details_simple (element_class, + "bulge", + "Transform/Effect/Video", + "Adds a protuberance in the center point", + "Filippo Argiolas "); +} + +static gboolean +bulge_map (GstGeometricTransform * gt, gint x, gint y, gdouble * in_x, + gdouble * in_y) +{ + GstCircleGeometricTransform *cgt = GST_CIRCLE_GEOMETRIC_TRANSFORM_CAST (gt); + GstBulge *bulge = GST_BULGE_CAST (gt); + + gdouble norm_x, norm_y; + gdouble r; + + gdouble width = gt->width; + gdouble height = gt->height; + + /* normalize in ((-1.0, -1.0), (1.0, 1.0) and traslate the center */ + norm_x = 2.0 * (x / width - cgt->x_center); + norm_y = 2.0 * (y / height - cgt->y_center); + + r = sqrt (norm_x * norm_x + norm_y * norm_y); + + /* maps r to r^2 in the step region */ + /* interpolating from negative values limits the amount of zoom at + * the center so the first edge could be used as intensity + * parameter */ + /* the second edge is the bulge radius, see gststretch.c for + * comments about its customizability */ + norm_x *= smoothstep (-0.15, 0.6, r); + norm_y *= smoothstep (-0.15, 0.6, r); + + /* unnormalize */ + *in_x = (0.5 * norm_x + cgt->x_center) * width; + *in_y = (0.5 * norm_y + cgt->y_center) * height; + + GST_DEBUG_OBJECT (bulge, "Inversely mapped %d %d into %lf %lf", + x, y, *in_x, *in_y); + + return TRUE; +} + +static void +gst_bulge_class_init (GstBulgeClass * 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_bulge_finalize); + + gstgt_class->map_func = bulge_map; +} + +static void +gst_bulge_init (GstBulge * filter, GstBulgeClass * gclass) +{ + GstGeometricTransform *gt = GST_GEOMETRIC_TRANSFORM (filter); + + gt->off_edge_pixels = GST_GT_OFF_EDGES_PIXELS_CLAMP; +} + +gboolean +gst_bulge_plugin_init (GstPlugin * plugin) +{ + GST_DEBUG_CATEGORY_INIT (gst_bulge_debug, "bulge", 0, "bulge"); + + return gst_element_register (plugin, "bulge", GST_RANK_NONE, GST_TYPE_BULGE); +} diff --git a/gst/geometrictransform/gstbulge.h b/gst/geometrictransform/gstbulge.h new file mode 100644 index 0000000000..9aa3b405ad --- /dev/null +++ b/gst/geometrictransform/gstbulge.h @@ -0,0 +1,82 @@ +/* + * GStreamer + * Copyright (C) 2010 Filippo Argiolas + * + * 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_BULGE_H__ +#define __GST_BULGE_H__ + +#include +#include "gstcirclegeometrictransform.h" + +G_BEGIN_DECLS +/* #defines don't like whitespacey bits */ +#define GST_TYPE_BULGE \ + (gst_bulge_get_type()) +#define GST_BULGE(obj) \ + (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_BULGE,GstBulge)) +#define GST_BULGE_CAST(obj) \ + ((GstBulge *)(obj)) +#define GST_BULGE_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_BULGE,GstBulgeClass)) +#define GST_IS_BULGE(obj) \ + (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_BULGE)) +#define GST_IS_BULGE_CLASS(klass) \ + (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_BULGE)) +typedef struct _GstBulge GstBulge; +typedef struct _GstBulgeClass GstBulgeClass; + +struct _GstBulge +{ + GstCircleGeometricTransform element; +}; + +struct _GstBulgeClass +{ + GstCircleGeometricTransformClass parent_class; +}; + +GType gst_bulge_get_type (void); + +gboolean gst_bulge_plugin_init (GstPlugin * plugin); + +G_END_DECLS +#endif /* __GST_BULGE_H__ */ diff --git a/gst/geometrictransform/plugin.c b/gst/geometrictransform/plugin.c index e7af53e2e4..cc9e11cbd6 100644 --- a/gst/geometrictransform/plugin.c +++ b/gst/geometrictransform/plugin.c @@ -30,6 +30,7 @@ #include "gsttwirl.h" #include "gstwaterripple.h" #include "gststretch.h" +#include "gstbulge.h" static gboolean plugin_init (GstPlugin * plugin) @@ -61,6 +62,9 @@ plugin_init (GstPlugin * plugin) if (!gst_stretch_plugin_init (plugin)) return FALSE; + if (!gst_bulge_plugin_init (plugin)) + return FALSE; + return TRUE; }