mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-07-28 09:15:08 +00:00
gst/goom/Makefile.am: Remove the warnings being disabled, fix linkage on x86, spotted by Sebastian Dröge
Original commit message from CVS: * gst/goom/Makefile.am: Remove the warnings being disabled, fix linkage on x86, spotted by Sebastian Dröge <slomo@circular-chaos.org> * 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)
This commit is contained in:
Bastien Nocera
parent
a7bc7485b1
commit
e8ef50ac94
17
ChangeLog
17
ChangeLog
|
|
@ -1,3 +1,20 @@
|
|||
2008-02-23 Bastien Nocera <hadess@hadess.net>
|
||||
|
||||
* gst/goom/Makefile.am: Remove the warnings being disabled,
|
||||
fix linkage on x86, spotted by Sebastian Dröge
|
||||
<slomo@circular-chaos.org>
|
||||
|
||||
* 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 <hadess@hadess.net>
|
||||
|
||||
* configure.ac: Add checks for Flex/Yacc/Bison and other
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@
|
|||
|
||||
#include <liboil/liboil.h>
|
||||
#include <liboil/liboilfunction.h>
|
||||
#include <liboil/liboilcpu.h>
|
||||
#define VERBOSE 1
|
||||
|
||||
static void
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue