[179/906] distortion effect cleanup

diff --git a/gst/gl/effects/gstgleffectbulge.c b/gst/gl/effects/gstgleffectbulge.c
index 5af38b9a6da9641f5810aaabb7f029b76f3403e8..5fe06fc17a903f62fffa50f7eddfb64ee59b7746 100644 (file)
--- 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 fb4e0d8cdece4b894d27321fbf624773db16a62d..dee444ac85c85e27ea82bf9888cb1b1e6a0bc442 100644 (file)
--- 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 11f3ad8a7d0a022ada7d6caf6b04965aa46edcfe..dbaf67fab9a7773183182e7338a15abdd627a650 100644 (file)
--- 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 (file)
index 11f3ad8..0000000
--- a/gst/gl/effects/gstgleffectsdistortion.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * GStreamer
- * Copyright (C) 2008 Filippo Argiolas <filippo.argiolas@gmail.com>
- *
- * 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 <gstgleffects.h>
-
-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 e941fc23094b071ab1103f1b84cdb67b1d88aa5d..f06faba9492637665b8f2dfa27727333f6c99a99 100644 (file)
--- 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 b07a62457d2ec63f38a0dbee81f03e1349b5a7bf..ebedcde5593523350384a8200ed5bab6dd12cfc7 100644 (file)
--- 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 503244ab2d316f9e2e6368e7a4fb67df7ec3dc54..7c9be7f800c2e14e68ac9efca65c7743e807e5cb 100644 (file)
--- 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 cc0245e8efe2dc444fac47cbb3ec75e8002a9bbb..dc81ef82579e194e06fad9656a5f016c3e29cdfc 100644 (file)
--- 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 5fbb9329da052c81ded0e194934ed157b49fee08..79b854cd4ad5581829706e88c8614ab9b8d78faa 100644 (file)
--- 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);