From 91006dae0972d587b12b4b42646c4da7b74c3825 Mon Sep 17 00:00:00 2001 From: Filippo Argiolas Date: Sat, 16 Aug 2008 12:37:36 +0200 Subject: [PATCH] [179/906] distortion effect cleanup --- gst/gl/effects/gstgleffectbulge.c | 8 +-- gst/gl/effects/gstgleffectfisheye.c | 10 ++-- gst/gl/effects/gstgleffectmirror.c | 10 ++-- gst/gl/effects/gstgleffectsdistortion.c | 68 ------------------------- gst/gl/effects/gstgleffectsquare.c | 8 +-- gst/gl/effects/gstgleffectsqueeze.c | 8 +-- gst/gl/effects/gstgleffectstretch.c | 8 +-- gst/gl/effects/gstgleffecttunnel.c | 8 +-- gst/gl/effects/gstgleffecttwirl.c | 4 -- 9 files changed, 16 insertions(+), 116 deletions(-) delete mode 100644 gst/gl/effects/gstgleffectsdistortion.c diff --git a/gst/gl/effects/gstgleffectbulge.c b/gst/gl/effects/gstgleffectbulge.c index 5af38b9a6d..5fe06fc17a 100644 --- a/gst/gl/effects/gstgleffectbulge.c +++ b/gst/gl/effects/gstgleffectbulge.c @@ -26,7 +26,6 @@ gst_gl_effects_bulge_callback (gint width, gint height, guint texture, gpointer GstGLEffects* effects = GST_GL_EFFECTS (data); GstGLShader *shader; - gfloat tex_size[2]; shader = g_hash_table_lookup (effects->shaderstable, "bulge0"); @@ -50,11 +49,8 @@ gst_gl_effects_bulge_callback (gint width, gint height, guint texture, gpointer gst_gl_shader_set_uniform_1i (shader, "tex", 0); - tex_size[0] = GST_GL_FILTER(effects)->width / 2.0; - tex_size[1] = GST_GL_FILTER(effects)->height / 2.0; - - gst_gl_shader_set_uniform_1f (shader, "width", tex_size[0]); - gst_gl_shader_set_uniform_1f (shader, "height", tex_size[1]); + gst_gl_shader_set_uniform_1f (shader, "width", width / 2.0); + gst_gl_shader_set_uniform_1f (shader, "height", height / 2.0); gst_gl_effects_draw_texture (effects, texture); } diff --git a/gst/gl/effects/gstgleffectfisheye.c b/gst/gl/effects/gstgleffectfisheye.c index fb4e0d8cde..dee444ac85 100644 --- a/gst/gl/effects/gstgleffectfisheye.c +++ b/gst/gl/effects/gstgleffectfisheye.c @@ -26,8 +26,7 @@ gst_gl_effects_fisheye_callback (gint width, gint height, guint texture, gpointe GstGLEffects* effects = GST_GL_EFFECTS (data); GstGLShader *shader; - gfloat tex_size[2]; - + shader = g_hash_table_lookup (effects->shaderstable, "fisheye0"); if (!shader) { @@ -50,11 +49,8 @@ gst_gl_effects_fisheye_callback (gint width, gint height, guint texture, gpointe gst_gl_shader_set_uniform_1i (shader, "tex", 0); - tex_size[0] = GST_GL_FILTER(effects)->width / 2.0; - tex_size[1] = GST_GL_FILTER(effects)->height / 2.0; - - gst_gl_shader_set_uniform_1f (shader, "width", tex_size[0]); - gst_gl_shader_set_uniform_1f (shader, "height", tex_size[1]); + gst_gl_shader_set_uniform_1f (shader, "width", width / 2.0); + gst_gl_shader_set_uniform_1f (shader, "height", height / 2.0); gst_gl_effects_draw_texture (effects, texture); } diff --git a/gst/gl/effects/gstgleffectmirror.c b/gst/gl/effects/gstgleffectmirror.c index 11f3ad8a7d..dbaf67fab9 100644 --- a/gst/gl/effects/gstgleffectmirror.c +++ b/gst/gl/effects/gstgleffectmirror.c @@ -26,8 +26,7 @@ gst_gl_effects_mirror_callback (gint width, gint height, guint texture, gpointer GstGLEffects* effects = GST_GL_EFFECTS (data); GstGLShader *shader; - gfloat tex_size[2]; - + shader = g_hash_table_lookup (effects->shaderstable, "mirror0"); if (!shader) { @@ -50,11 +49,8 @@ gst_gl_effects_mirror_callback (gint width, gint height, guint texture, gpointer gst_gl_shader_set_uniform_1i (shader, "tex", 0); - tex_size[0] = GST_GL_FILTER(effects)->width / 2.0; - tex_size[1] = GST_GL_FILTER(effects)->height / 2.0; - - gst_gl_shader_set_uniform_1f (shader, "width", tex_size[0]); - gst_gl_shader_set_uniform_1f (shader, "height", tex_size[1]); + gst_gl_shader_set_uniform_1f (shader, "width", width / 2.0); + gst_gl_shader_set_uniform_1f (shader, "height", height / 2.0); gst_gl_effects_draw_texture (effects, texture); } diff --git a/gst/gl/effects/gstgleffectsdistortion.c b/gst/gl/effects/gstgleffectsdistortion.c deleted file mode 100644 index 11f3ad8a7d..0000000000 --- a/gst/gl/effects/gstgleffectsdistortion.c +++ /dev/null @@ -1,68 +0,0 @@ -/* - * GStreamer - * Copyright (C) 2008 Filippo Argiolas - * - * 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. - */ - -#include - -static void -gst_gl_effects_mirror_callback (gint width, gint height, guint texture, gpointer data) -{ - GstGLEffects* effects = GST_GL_EFFECTS (data); - - GstGLShader *shader; - gfloat tex_size[2]; - - shader = g_hash_table_lookup (effects->shaderstable, "mirror0"); - - if (!shader) { - shader = gst_gl_shader_new (); - g_hash_table_insert (effects->shaderstable, "mirror0", shader); - } - - g_return_if_fail ( - gst_gl_shader_compile_and_check (shader, mirror_fragment_source, - GST_GL_SHADER_FRAGMENT_SOURCE)); - - glMatrixMode (GL_PROJECTION); - glLoadIdentity (); - - gst_gl_shader_use (shader); - - glActiveTexture (GL_TEXTURE0); - glEnable (GL_TEXTURE_RECTANGLE_ARB); - glBindTexture (GL_TEXTURE_RECTANGLE_ARB, texture); - - gst_gl_shader_set_uniform_1i (shader, "tex", 0); - - tex_size[0] = GST_GL_FILTER(effects)->width / 2.0; - tex_size[1] = GST_GL_FILTER(effects)->height / 2.0; - - gst_gl_shader_set_uniform_1f (shader, "width", tex_size[0]); - gst_gl_shader_set_uniform_1f (shader, "height", tex_size[1]); - - gst_gl_effects_draw_texture (effects, texture); -} - -void -gst_gl_effects_mirror (GstGLEffects *effects) { - GstGLFilter *filter = GST_GL_FILTER (effects); - - gst_gl_filter_render_to_target (filter, effects->intexture, effects->outtexture, - gst_gl_effects_mirror_callback, effects); -} diff --git a/gst/gl/effects/gstgleffectsquare.c b/gst/gl/effects/gstgleffectsquare.c index e941fc2309..f06faba949 100644 --- a/gst/gl/effects/gstgleffectsquare.c +++ b/gst/gl/effects/gstgleffectsquare.c @@ -26,7 +26,6 @@ gst_gl_effects_square_callback (gint width, gint height, guint texture, gpointer GstGLEffects* effects = GST_GL_EFFECTS (data); GstGLShader *shader; - gfloat tex_size[2]; shader = g_hash_table_lookup (effects->shaderstable, "square0"); @@ -50,11 +49,8 @@ gst_gl_effects_square_callback (gint width, gint height, guint texture, gpointer gst_gl_shader_set_uniform_1i (shader, "tex", 0); - tex_size[0] = GST_GL_FILTER(effects)->width / 2.0; - tex_size[1] = GST_GL_FILTER(effects)->height / 2.0; - - gst_gl_shader_set_uniform_1f (shader, "width", tex_size[0]); - gst_gl_shader_set_uniform_1f (shader, "height", tex_size[1]); + gst_gl_shader_set_uniform_1f (shader, "width", width / 2.0); + gst_gl_shader_set_uniform_1f (shader, "height", height / 2.0); gst_gl_effects_draw_texture (effects, texture); } diff --git a/gst/gl/effects/gstgleffectsqueeze.c b/gst/gl/effects/gstgleffectsqueeze.c index b07a62457d..ebedcde559 100644 --- a/gst/gl/effects/gstgleffectsqueeze.c +++ b/gst/gl/effects/gstgleffectsqueeze.c @@ -26,7 +26,6 @@ gst_gl_effects_squeeze_callback (gint width, gint height, guint texture, gpointe GstGLEffects* effects = GST_GL_EFFECTS (data); GstGLShader *shader; - gfloat tex_size[2]; shader = g_hash_table_lookup (effects->shaderstable, "squeeze0"); @@ -50,11 +49,8 @@ gst_gl_effects_squeeze_callback (gint width, gint height, guint texture, gpointe gst_gl_shader_set_uniform_1i (shader, "tex", 0); - tex_size[0] = GST_GL_FILTER(effects)->width / 2.0; - tex_size[1] = GST_GL_FILTER(effects)->height / 2.0; - - gst_gl_shader_set_uniform_1f (shader, "width", tex_size[0]); - gst_gl_shader_set_uniform_1f (shader, "height", tex_size[1]); + gst_gl_shader_set_uniform_1f (shader, "width", width / 2.0); + gst_gl_shader_set_uniform_1f (shader, "height", height / 2.0); gst_gl_effects_draw_texture (effects, texture); } diff --git a/gst/gl/effects/gstgleffectstretch.c b/gst/gl/effects/gstgleffectstretch.c index 503244ab2d..7c9be7f800 100644 --- a/gst/gl/effects/gstgleffectstretch.c +++ b/gst/gl/effects/gstgleffectstretch.c @@ -26,7 +26,6 @@ gst_gl_effects_stretch_callback (gint width, gint height, guint texture, gpointe GstGLEffects* effects = GST_GL_EFFECTS (data); GstGLShader *shader; - gfloat tex_size[2]; shader = g_hash_table_lookup (effects->shaderstable, "stretch0"); @@ -50,11 +49,8 @@ gst_gl_effects_stretch_callback (gint width, gint height, guint texture, gpointe gst_gl_shader_set_uniform_1i (shader, "tex", 0); - tex_size[0] = GST_GL_FILTER(effects)->width / 2.0; - tex_size[1] = GST_GL_FILTER(effects)->height / 2.0; - - gst_gl_shader_set_uniform_1f (shader, "width", tex_size[0]); - gst_gl_shader_set_uniform_1f (shader, "height", tex_size[1]); + gst_gl_shader_set_uniform_1f (shader, "width", width / 2.0); + gst_gl_shader_set_uniform_1f (shader, "height", height / 2.0); gst_gl_effects_draw_texture (effects, texture); } diff --git a/gst/gl/effects/gstgleffecttunnel.c b/gst/gl/effects/gstgleffecttunnel.c index cc0245e8ef..dc81ef8257 100644 --- a/gst/gl/effects/gstgleffecttunnel.c +++ b/gst/gl/effects/gstgleffecttunnel.c @@ -26,7 +26,6 @@ gst_gl_effects_tunnel_callback (gint width, gint height, guint texture, gpointer GstGLEffects* effects = GST_GL_EFFECTS (data); GstGLShader *shader; - gfloat tex_size[2]; shader = g_hash_table_lookup (effects->shaderstable, "tunnel0"); @@ -50,11 +49,8 @@ gst_gl_effects_tunnel_callback (gint width, gint height, guint texture, gpointer gst_gl_shader_set_uniform_1i (shader, "tex", 0); - tex_size[0] = GST_GL_FILTER(effects)->width / 2.0; - tex_size[1] = GST_GL_FILTER(effects)->height / 2.0; - - gst_gl_shader_set_uniform_1f (shader, "width", tex_size[0]); - gst_gl_shader_set_uniform_1f (shader, "height", tex_size[1]); + gst_gl_shader_set_uniform_1f (shader, "width", width / 2.0); + gst_gl_shader_set_uniform_1f (shader, "height", height / 2.0); gst_gl_effects_draw_texture (effects, texture); } diff --git a/gst/gl/effects/gstgleffecttwirl.c b/gst/gl/effects/gstgleffecttwirl.c index 5fbb9329da..79b854cd4a 100644 --- a/gst/gl/effects/gstgleffecttwirl.c +++ b/gst/gl/effects/gstgleffecttwirl.c @@ -26,7 +26,6 @@ gst_gl_effects_twirl_callback (gint width, gint height, guint texture, gpointer GstGLEffects* effects = GST_GL_EFFECTS (data); GstGLShader *shader; - gfloat tex_size[2]; shader = g_hash_table_lookup (effects->shaderstable, "twirl0"); @@ -50,9 +49,6 @@ gst_gl_effects_twirl_callback (gint width, gint height, guint texture, gpointer gst_gl_shader_set_uniform_1i (shader, "tex", 0); - tex_size[0] = GST_GL_FILTER(effects)->width / 2.0; - tex_size[1] = GST_GL_FILTER(effects)->height / 2.0; - gst_gl_shader_set_uniform_1f (shader, "width", width / 2.0); gst_gl_shader_set_uniform_1f (shader, "height", height / 2.0);