From e8ef50ac94938ee230dd15642b86a332d365a1f4 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Sat, 23 Feb 2008 02:38:03 +0000 Subject: [PATCH] =?utf8?q?gst/goom/Makefile.am:=20Remove=20the=20warnings?= =?utf8?q?=20being=20disabled,=20fix=20linkage=20on=20x86,=20spotted=20by?= =?utf8?q?=20Sebastian=20Dr=C3=B6ge?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Original commit message from CVS: * gst/goom/Makefile.am: Remove the warnings being disabled, fix linkage on x86, spotted by Sebastian Dröge * gst/goom/convolve_fx.c (convolve_init), (create_output_with_brightness), (convolve_apply): * gst/goom/filters.c (zoomFilterVisualFXWrapper_create): * gst/goom/goomsl.c: * gst/goom/ifs.c (ifs_update), (ifs_visualfx_create): * gst/goom/plugin_info.c: * gst/goom/tentacle3d.c (tentacle_fx_create): Fix warnings, and disable the motifs in the convolve_fx plugin (they were causing warnings, and they were just "Goom" in funny letterring) --- ChangeLog | 17 +++++++++++++++++ gst/goom/Makefile.am | 4 ++-- gst/goom/convolve_fx.c | 17 ++++++++++++----- gst/goom/filters.c | 2 ++ gst/goom/goomsl.c | 2 ++ gst/goom/ifs.c | 4 +++- gst/goom/plugin_info.c | 1 + gst/goom/tentacle3d.c | 3 +++ 8 files changed, 42 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index c190062..f0d0228 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,22 @@ 2008-02-23 Bastien Nocera + * gst/goom/Makefile.am: Remove the warnings being disabled, + fix linkage on x86, spotted by Sebastian Dröge + + + * gst/goom/convolve_fx.c (convolve_init), + (create_output_with_brightness), (convolve_apply): + * gst/goom/filters.c (zoomFilterVisualFXWrapper_create): + * gst/goom/goomsl.c: + * gst/goom/ifs.c (ifs_update), (ifs_visualfx_create): + * gst/goom/plugin_info.c: + * gst/goom/tentacle3d.c (tentacle_fx_create): + Fix warnings, and disable the motifs in the convolve_fx + plugin (they were causing warnings, and they were just + "Goom" in funny letterring) + +2008-02-23 Bastien Nocera + * configure.ac: Add checks for Flex/Yacc/Bison and other furry animals, for the new goom 2k4 based plugin diff --git a/gst/goom/Makefile.am b/gst/goom/Makefile.am index 41e9cb3..703426f 100644 --- a/gst/goom/Makefile.am +++ b/gst/goom/Makefile.am @@ -11,6 +11,7 @@ ARCH_FILES = $(PPC_FILES) endif if HAVE_CPU_I386 ARCH_FILES = $(MMX_FILES) +ARCH_CFLAGS = -DHAVE_MMX endif libgstgoom_la_SOURCES = \ @@ -35,8 +36,7 @@ libgstgoom_la_SOURCES = \ goom_tools.h goom_tools.h goom_config.h \ $(ARCH_FILES) -ERROR_CFLAGS= -libgstgoom_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(GOOM_FILTER_CFLAGS) $(LIBOIL_CFLAGS) +libgstgoom_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(GOOM_FILTER_CFLAGS) $(LIBOIL_CFLAGS) $(ARCH_CFLAGS) libgstgoom_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS) $(LIBM) $(LIBOIL_LIBS) libgstgoomconfigparse.la libgstgoom_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/gst/goom/convolve_fx.c b/gst/goom/convolve_fx.c index 261c5fa..fb5e0b5 100644 --- a/gst/goom/convolve_fx.c +++ b/gst/goom/convolve_fx.c @@ -15,8 +15,10 @@ typedef char Motif[CONV_MOTIF_W][CONV_MOTIF_W]; +#if 0 #include "motif_goom1.h" #include "motif_goom2.h" +#endif #define NB_THETA 512 @@ -67,6 +69,7 @@ compute_tables (VisualFX * _this, PluginInfo * info) } } +#if 0 static void set_motif (ConvData * data, Motif motif) { @@ -77,7 +80,7 @@ set_motif (ConvData * data, Motif motif) data->conv_motif[i][j] = motif[CONV_MOTIF_W - i - 1][CONV_MOTIF_W - j - 1]; } - +#endif static void convolve_init (VisualFX * _this, PluginInfo * info) { @@ -110,7 +113,9 @@ convolve_init (VisualFX * _this, PluginInfo * info) data->theta = 0; data->ftheta = 0.0; data->visibility = 1.0; +#if 0 set_motif (data, CONV_MOTIF2); +#endif data->inverse_motif = 0; _this->params = &data->params; @@ -209,11 +214,12 @@ create_output_with_brightness (VisualFX * _this, Pixel * src, Pixel * dest, xtex += c; ytex -= s; - iff2 = - ifftab[data-> + iff2 = 0; +#if 0 + ifftab[data-> conv_motif[(ytex >> 16) & CONV_MOTIF_WMASK][(xtex >> 16) & CONV_MOTIF_WMASK]]; - +#endif #define sat(a) ((a)>0xFF?0xFF:(a)) f0 = src[i].val; f1 = ((f0 >> R_OFFSET) & 0xFF) * iff2 >> 8; @@ -293,6 +299,7 @@ convolve_apply (VisualFX * _this, Pixel * src, Pixel * dest, PluginInfo * info) data->factor_p.change_listener (&data->factor_p); } +#if 0 if (data->visibility < 0.01) { switch (goom_irand (info->gRandom, 300)) { case 1: @@ -305,7 +312,7 @@ convolve_apply (VisualFX * _this, Pixel * src, Pixel * dest, PluginInfo * info) break; } } - +#endif if ((ff > 0.98f) && (ff < 1.02f)) memcpy (dest, src, info->screen.size * sizeof (Pixel)); else diff --git a/gst/goom/filters.c b/gst/goom/filters.c index 07e989e..822d4a1 100644 --- a/gst/goom/filters.c +++ b/gst/goom/filters.c @@ -810,6 +810,8 @@ zoomFilterVisualFXWrapper_create (void) fx.init = zoomFilterVisualFXWrapper_init; fx.free = zoomFilterVisualFXWrapper_free; fx.apply = zoomFilterVisualFXWrapper_apply; + fx.params = NULL; + fx.fx_data = NULL; return fx; } diff --git a/gst/goom/goomsl.c b/gst/goom/goomsl.c index b07b259..6d3254a 100644 --- a/gst/goom/goomsl.c +++ b/gst/goom/goomsl.c @@ -1020,6 +1020,7 @@ calculate_labels (InstructionFlow * iflow) } } /* }}} */ +#ifdef USE_JITC_X86 static int powerOfTwo (int i) { @@ -1030,6 +1031,7 @@ powerOfTwo (int i) return b; return 0; } +#endif /* Cree un flow d'instruction optimise */ static void diff --git a/gst/goom/ifs.c b/gst/goom/ifs.c index 8e72548..ccadaa7 100644 --- a/gst/goom/ifs.c +++ b/gst/goom/ifs.c @@ -482,7 +482,7 @@ ifs_update (PluginInfo * goomInfo, Pixel * data, Pixel * back, int increment, static int cycle = 0; int cycle10; - int nbpt; + int nbpt = 0; IFSPoint *points; int i; @@ -772,5 +772,7 @@ ifs_visualfx_create (void) vfx.init = ifs_vfx_init; vfx.free = ifs_vfx_free; vfx.apply = ifs_vfx_apply; + vfx.fx_data = NULL; + vfx.params = NULL; return vfx; } diff --git a/gst/goom/plugin_info.c b/gst/goom/plugin_info.c index 2aeeb4f..ce5e868 100644 --- a/gst/goom/plugin_info.c +++ b/gst/goom/plugin_info.c @@ -22,6 +22,7 @@ #include #include +#include #define VERBOSE 1 static void diff --git a/gst/goom/tentacle3d.c b/gst/goom/tentacle3d.c index 4450393..e1f3e78 100644 --- a/gst/goom/tentacle3d.c +++ b/gst/goom/tentacle3d.c @@ -115,6 +115,8 @@ tentacle_fx_create (void) fx.init = tentacle_fx_init; fx.apply = tentacle_fx_apply; fx.free = tentacle_fx_free; + fx.fx_data = NULL; + fx.params = NULL; return fx; } @@ -312,6 +314,7 @@ tentacle_update (PluginInfo * goomInfo, Pixel * buf, Pixel * back, int W, int H, float val = (float) (ShiftRight (data[0][goom_irand (goomInfo->gRandom, 511)], 10)) * rapport; + fx_data->vals[tmp2] = val; } -- 2.7.4