summaryrefslogtreecommitdiffstats
path: root/ext
diff options
context:
space:
mode:
Diffstat (limited to 'ext')
-rw-r--r--ext/arts/Makefile.am2
-rw-r--r--ext/arts/gst_arts.c8
-rw-r--r--ext/artsd/Makefile.am2
-rw-r--r--ext/artsd/gstartsdsink.c28
-rw-r--r--ext/audiofile/Makefile.am4
-rw-r--r--ext/gsm/Makefile.am2
-rw-r--r--ext/gsm/gstgsmdec.c4
-rw-r--r--ext/hermes/Makefile.am2
-rw-r--r--ext/hermes/gstcolorspace.c4
-rw-r--r--ext/hermes/gstcolorspace.h2
-rw-r--r--ext/hermes/yuv2rgb.c244
-rw-r--r--ext/hermes/yuv2yuv.c2
-rw-r--r--ext/jack/Makefile.am2
-rw-r--r--ext/jack/gstjack.c4
-rw-r--r--ext/ladspa/Makefile.am2
-rw-r--r--ext/ladspa/gstladspa.c2
-rw-r--r--ext/ladspa/search.c6
-rw-r--r--ext/sdl/Makefile.am2
-rw-r--r--ext/shout/Makefile.am2
-rw-r--r--ext/shout/gstshout.c42
-rw-r--r--ext/smoothwave/Makefile.am2
-rw-r--r--ext/smoothwave/gstsmoothwave.c52
-rw-r--r--ext/tarkin/Makefile.am2
-rw-r--r--ext/tarkin/bitcoder.h4
-rw-r--r--ext/tarkin/golomb.h2
-rw-r--r--ext/tarkin/info.c2
-rw-r--r--ext/tarkin/tarkin.c2
-rw-r--r--ext/tarkin/wavelet_coeff.c8
28 files changed, 220 insertions, 220 deletions
diff --git a/ext/arts/Makefile.am b/ext/arts/Makefile.am
index 0a31dad1..5206edcf 100644
--- a/ext/arts/Makefile.am
+++ b/ext/arts/Makefile.am
@@ -21,7 +21,7 @@ CLEANFILES = gst_artsio.h gst_artsio.cc gst_artsio.mcopclass gst_artsio.mcoptype
libgstarts_la_SOURCES = gst_arts.c gst_artsio.cc gst_artsio_impl.cc
libgstarts_la_CFLAGS = $(GST_CFLAGS)
libgstarts_la_CXXFLAGS = $(ARTS_CXXFLAGS) $(GST_CFLAGS)
-libgstarts_la_LIBADD = $(GST_LIBS) $(ARTS_LIBS) -lartsflow
+libgstarts_la_LIBADD = $(ARTS_LIBS) -lartsflow
libgstarts_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
EXTRA_DIST = gst_artsio.idl
diff --git a/ext/arts/gst_arts.c b/ext/arts/gst_arts.c
index 7cd4b250..736b41c1 100644
--- a/ext/arts/gst_arts.c
+++ b/ext/arts/gst_arts.c
@@ -21,7 +21,7 @@
#include <math.h>
#include <sys/soundcard.h>
-//#define DEBUG_ENABLED
+/*#define DEBUG_ENABLED */
#include "gst_arts.h"
#include "gst_artsio_impl.h"
@@ -115,7 +115,7 @@ static void gst_arts_loop (GstElement *element);
static GstElementClass *parent_class = NULL;
-//static guint gst_arts_signals[LAST_SIGNAL] = { 0 };
+/*static guint gst_arts_signals[LAST_SIGNAL] = { 0 }; */
GType
gst_arts_get_type (void)
@@ -159,7 +159,7 @@ gst_arts_init (GstARTS *arts)
arts->sinkpad = gst_pad_new_from_template(GST_PADTEMPLATE_GET(sink_temp),"sink");
gst_element_add_pad(GST_ELEMENT(arts),arts->sinkpad);
-// arts->srcpad = gst_pad_new_from_template(GST_PADTEMPLATE_GET(src_temp),"src");
+/* arts->srcpad = gst_pad_new_from_template(GST_PADTEMPLATE_GET(src_temp),"src"); */
arts->srcpad = gst_pad_new_from_template(mad_src_template_factory (), "src");
gst_element_add_pad(GST_ELEMENT(arts),arts->srcpad);
@@ -223,7 +223,7 @@ plugin_init (GModule *module, GstPlugin *plugin)
g_return_val_if_fail(gstarts != NULL, FALSE);
gst_elementfactory_add_padtemplate(gstarts, GST_PADTEMPLATE_GET(sink_temp));
-// gst_elementfactory_add_padtemplate(gstarts, GST_PADTEMPLATE_GET(src_temp));
+/* gst_elementfactory_add_padtemplate(gstarts, GST_PADTEMPLATE_GET(src_temp)); */
gst_elementfactory_add_padtemplate(gstarts, mad_src_template_factory ());
gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (gstarts));
diff --git a/ext/artsd/Makefile.am b/ext/artsd/Makefile.am
index c3ee6227..e467d5a9 100644
--- a/ext/artsd/Makefile.am
+++ b/ext/artsd/Makefile.am
@@ -4,7 +4,7 @@ plugin_LTLIBRARIES = libartsdsink.la
libartsdsink_la_SOURCES = gstartsdsink.c
libartsdsink_la_CFLAGS = $(GST_CFLAGS) $(ARTSC_CFLAGS)
-libartsdsink_la_LIBADD = $(GST_LIBS) $(ARTSC_LIBS)
+libartsdsink_la_LIBADD = $(ARTSC_LIBS)
libartsdsink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = gstartsdsink.h
diff --git a/ext/artsd/gstartsdsink.c b/ext/artsd/gstartsdsink.c
index 0a870702..c829d502 100644
--- a/ext/artsd/gstartsdsink.c
+++ b/ext/artsd/gstartsdsink.c
@@ -126,7 +126,7 @@ gst_artsdsink_channels_get_type (void)
static GstElementClass *parent_class = NULL;
-//static guint gst_artsdsink_signals[LAST_SIGNAL] = { 0 };
+/*static guint gst_artsdsink_signals[LAST_SIGNAL] = { 0 }; */
GType
gst_artsdsink_get_type (void)
@@ -162,19 +162,19 @@ gst_artsdsink_class_init (GstArtsdsinkClass *klass)
g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_MUTE,
g_param_spec_boolean("mute","mute","mute",
- TRUE,G_PARAM_READWRITE)); // CHECKME
+ TRUE,G_PARAM_READWRITE)); /* CHECKME */
g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_DEPTH,
g_param_spec_enum("depth","depth","depth",
- GST_TYPE_ARTSDSINK_DEPTHS,16,G_PARAM_READWRITE)); // CHECKME!
+ GST_TYPE_ARTSDSINK_DEPTHS,16,G_PARAM_READWRITE)); /* CHECKME! */
g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_CHANNELS,
g_param_spec_enum("channels","channels","channels",
- GST_TYPE_ARTSDSINK_CHANNELS,2,G_PARAM_READWRITE)); // CHECKME!
+ GST_TYPE_ARTSDSINK_CHANNELS,2,G_PARAM_READWRITE)); /* CHECKME! */
g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_RATE,
g_param_spec_int("frequency","frequency","frequency",
- G_MININT,G_MAXINT,0,G_PARAM_READWRITE)); // CHECKME
+ G_MININT,G_MAXINT,0,G_PARAM_READWRITE)); /* CHECKME */
g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_NAME,
g_param_spec_string("name","name","name",
- NULL, G_PARAM_READWRITE)); // CHECKME
+ NULL, G_PARAM_READWRITE)); /* CHECKME */
gobject_class->set_property = gst_artsdsink_set_property;
gobject_class->get_property = gst_artsdsink_get_property;
@@ -193,7 +193,7 @@ gst_artsdsink_init(GstArtsdsink *artsdsink)
artsdsink->connected = FALSE;
artsdsink->mute = FALSE;
- // FIXME: get default from somewhere better than just putting them inline.
+ /* FIXME: get default from somewhere better than just putting them inline. */
artsdsink->signd = TRUE;
artsdsink->depth = 16;
artsdsink->channels = 2;
@@ -209,7 +209,7 @@ gst_artsdsink_sync_parms (GstArtsdsink *artsdsink)
if (!artsdsink->connected) return TRUE;
- // Need to set stream to use new parameters: only way to do this is to reopen.
+ /* Need to set stream to use new parameters: only way to do this is to reopen. */
gst_artsdsink_close_audio (artsdsink);
return gst_artsdsink_open_audio (artsdsink);
}
@@ -347,12 +347,12 @@ gst_artsdsink_open_audio (GstArtsdsink *sink)
const char * connname = "gstreamer";
int errcode;
- // Name used by aRtsd for this connection.
+ /* Name used by aRtsd for this connection. */
if (sink->connect_name != NULL) connname = sink->connect_name;
- // FIXME: this should only ever happen once per process.
- // Really, artsc needs to be made thread safe to fix this (and other related
- // problems).
+ /* FIXME: this should only ever happen once per process. */
+ /* Really, artsc needs to be made thread safe to fix this (and other related */
+ /* problems). */
errcode = arts_init();
if(errcode < 0) {
fprintf(stderr,"arts_init error: %s\n", arts_error_text(errcode));
@@ -362,8 +362,8 @@ gst_artsdsink_open_audio (GstArtsdsink *sink)
GST_DEBUG (0, "artsdsink: attempting to open connection to aRtsd server\n");
sink->stream = arts_play_stream(sink->frequency, sink->depth,
sink->channels, connname);
- // FIXME: check connection
- // GST_DEBUG (0, "artsdsink: can't open connection to aRtsd server\n");
+ /* FIXME: check connection */
+ /* GST_DEBUG (0, "artsdsink: can't open connection to aRtsd server\n"); */
GST_FLAG_SET (sink, GST_ARTSDSINK_OPEN);
sink->connected = TRUE;
diff --git a/ext/audiofile/Makefile.am b/ext/audiofile/Makefile.am
index d53a939d..9496364c 100644
--- a/ext/audiofile/Makefile.am
+++ b/ext/audiofile/Makefile.am
@@ -4,12 +4,12 @@ plugin_LTLIBRARIES = libafsink.la libafsrc.la
libafsink_la_SOURCES = gstafsink.c
libafsink_la_CFLAGS = $(GST_CFLAGS) $(AUDIOFILE_CFLAGS)
-libafsink_la_LIBADD = $(GST_LIBS) $(AUDIOFILE_LIBS)
+libafsink_la_LIBADD = $(AUDIOFILE_LIBS)
libafsink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
libafsrc_la_SOURCES = gstafsrc.c
libafsrc_la_CFLAGS = $(GST_CFLAGS) $(AUDIOFILE_CFLAGS)
-libafsrc_la_LIBADD = $(GST_LIBS) $(AUDIOFILE_LIBS)
+libafsrc_la_LIBADD = $(AUDIOFILE_LIBS)
libafsrc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = gstafsink.h gstafsrc.h
diff --git a/ext/gsm/Makefile.am b/ext/gsm/Makefile.am
index e0346f01..6854ca3e 100644
--- a/ext/gsm/Makefile.am
+++ b/ext/gsm/Makefile.am
@@ -4,7 +4,7 @@ plugin_LTLIBRARIES = libgstgsm.la
libgstgsm_la_SOURCES = gstgsm.c gstgsmdec.c gstgsmenc.c
libgstgsm_la_CFLAGS = $(GST_CFLAGS)
-libgstgsm_la_LIBADD = $(GST_LIBS) $(GSM_LIBS)
+libgstgsm_la_LIBADD = $(GSM_LIBS)
libgstgsm_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = gstgsmenc.h gstgsmdec.h
diff --git a/ext/gsm/gstgsmdec.c b/ext/gsm/gstgsmdec.c
index 8a61453a..1de21a30 100644
--- a/ext/gsm/gstgsmdec.c
+++ b/ext/gsm/gstgsmdec.c
@@ -52,7 +52,7 @@ static void gst_gsmdec_chain (GstPad *pad, GstBuffer *buf);
static GstPadConnectReturn gst_gsmdec_sinkconnect (GstPad *pad, GstCaps *caps);
static GstElementClass *parent_class = NULL;
-//static guint gst_gsmdec_signals[LAST_SIGNAL] = { 0 };
+/*static guint gst_gsmdec_signals[LAST_SIGNAL] = { 0 }; */
GType
gst_gsmdec_get_type(void) {
@@ -141,7 +141,7 @@ gst_gsmdec_chain (GstPad *pad, GstBuffer *buf)
g_return_if_fail(pad != NULL);
g_return_if_fail(GST_IS_PAD(pad));
g_return_if_fail(buf != NULL);
- //g_return_if_fail(GST_IS_BUFFER(buf));
+ /*g_return_if_fail(GST_IS_BUFFER(buf)); */
gsmdec = GST_GSMDEC (gst_pad_get_parent (pad));
diff --git a/ext/hermes/Makefile.am b/ext/hermes/Makefile.am
index 60b0af54..f178a29f 100644
--- a/ext/hermes/Makefile.am
+++ b/ext/hermes/Makefile.am
@@ -16,7 +16,7 @@ endif
libgstcolorspace_la_SOURCES = gstcolorspace.c yuv2yuv.c yuv2rgb.c rgb2yuv.c $(ARCHSRCS)
libgstcolorspace_la_CFLAGS = $(GST_CFLAGS)
-libgstcolorspace_la_LIBADD = $(GST_LIBS) $(PLUGIN_EXTRA_LIBS)
+libgstcolorspace_la_LIBADD = $(PLUGIN_EXTRA_LIBS)
libgstcolorspace_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = gstcolorspace.h yuv2rgb.h
diff --git a/ext/hermes/gstcolorspace.c b/ext/hermes/gstcolorspace.c
index 69ef4dab..7b35f900 100644
--- a/ext/hermes/gstcolorspace.c
+++ b/ext/hermes/gstcolorspace.c
@@ -97,7 +97,7 @@ static void gst_colorspace_chain (GstPad *pad, GstBuffer *buf);
static GstElementStateReturn
gst_colorspace_change_state (GstElement *element);
-// FIXME
+/* FIXME */
extern void gst_colorspace_yuy2_to_i420 (unsigned char *src, unsigned char *dest,
guint width, guint height);
extern void gst_colorspace_rgb32_to_i420 (unsigned char *src, unsigned char *dest,
@@ -106,7 +106,7 @@ extern void gst_colorspace_rgb32_to_yv12 (unsigned char *src, unsigned char *de
guint width, guint height);
static GstElementClass *parent_class = NULL;
-//static guint gst_colorspace_signals[LAST_SIGNAL] = { 0 };
+/*static guint gst_colorspace_signals[LAST_SIGNAL] = { 0 }; */
static GstBufferPool*
colorspace_get_bufferpool (GstPad *pad)
diff --git a/ext/hermes/gstcolorspace.h b/ext/hermes/gstcolorspace.h
index ca345fde..4a56e369 100644
--- a/ext/hermes/gstcolorspace.h
+++ b/ext/hermes/gstcolorspace.h
@@ -30,7 +30,7 @@
# include <Hermes/Hermes.h>
#endif
-// #include <gst/meta/audioraw.h>
+/* #include <gst/meta/audioraw.h> */
#ifdef __cplusplus
diff --git a/ext/hermes/yuv2rgb.c b/ext/hermes/yuv2rgb.c
index 0b5a9b4c..fb1da7f1 100644
--- a/ext/hermes/yuv2rgb.c
+++ b/ext/hermes/yuv2rgb.c
@@ -24,7 +24,7 @@
#include "yuv2rgb.h"
-//#undef HAVE_LIBMMX
+/*#undef HAVE_LIBMMX */
#ifdef HAVE_LIBMMX
#include "mmx.h"
@@ -116,7 +116,7 @@ gst_colorspace_yuv2rgb_get_converter (GstCaps *from, GstCaps *to)
to_space = gst_caps_get_fourcc_int (to, "format");
to_bpp = gst_caps_get_int (to, "bpp");
- // FIXME we leak new here.
+ /* FIXME we leak new here. */
g_return_val_if_fail (to_space == GST_STR_FOURCC ("RGB "), NULL);
switch(from_space) {
@@ -186,9 +186,9 @@ static void gst_colorspace_yuv420P_to_rgb32(GstColorSpaceConverter *space, unsig
size = space->width * space->height;
gst_colorspace_yuv_to_rgb32(space->color_tables,
- src, // Y component
- src+size, // cr component
- src+size+(size>>2), // cb component
+ src, /* Y component */
+ src+size, /* cr component */
+ src+size+(size>>2), /* cb component */
dest,
space->height,
space->width);
@@ -202,9 +202,9 @@ static void gst_colorspace_yuv420P_to_rgb24(GstColorSpaceConverter *space, unsig
size = space->width * space->height;
gst_colorspace_yuv_to_rgb24(space->color_tables,
- src, // Y component
- src+size, // cr component
- src+size+(size>>2), // cb component
+ src, /* Y component */
+ src+size, /* cr component */
+ src+size+(size>>2), /* cb component */
dest,
space->height,
space->width);
@@ -218,9 +218,9 @@ static void gst_colorspace_yuv420P_to_rgb16(GstColorSpaceConverter *space, unsig
size = space->width * space->height;
gst_colorspace_yuv_to_rgb16(space->color_tables,
- src, // Y component
- src+size, // cr component
- src+size+(size>>2), // cb component
+ src, /* Y component */
+ src+size, /* cr component */
+ src+size+(size>>2), /* cb component */
dest,
space->height,
space->width);
@@ -235,9 +235,9 @@ static void gst_colorspace_yuv420P_to_bgr32_mmx(GstColorSpaceConverter *space, u
size = space->width * space->height;
gst_colorspace_yuv_to_bgr32_mmx(NULL,
- src, // Y component
- src+size, // cr component
- src+size+(size>>2), // cb component
+ src, /* Y component */
+ src+size, /* cr component */
+ src+size+(size>>2), /* cb component */
dest,
space->height,
space->width);
@@ -250,9 +250,9 @@ static void gst_colorspace_yuv420P_to_bgr16_mmx(GstColorSpaceConverter *space, u
size = space->width * space->height;
gst_colorspace_yuv_to_bgr16_mmx(NULL,
- src, // Y component
- src+size, // cr component
- src+size+(size>>2), // cb component
+ src, /* Y component */
+ src+size, /* cr component */
+ src+size+(size>>2), /* cb component */
dest,
space->height,
space->width);
@@ -675,10 +675,10 @@ gst_colorspace_yuv_to_rgb32(tables, lum, cb, cr, out, rows, cols)
}
#ifdef HAVE_LIBMMX
-static mmx_t MMX_80w = (mmx_t)(long long)0x0080008000800080LL; //dd 00080 0080h, 000800080h
+static mmx_t MMX_80w = (mmx_t)(long long)0x0080008000800080LL; /*dd 00080 0080h, 000800080h */
-static mmx_t MMX_00FFw = (mmx_t)(long long)0x00ff00ff00ff00ffLL; //dd 000FF 00FFh, 000FF00FFh
-static mmx_t MMX_FF00w = (mmx_t)(long long)0xff00ff00ff00ff00LL; //dd 000FF 00FFh, 000FF00FFh
+static mmx_t MMX_00FFw = (mmx_t)(long long)0x00ff00ff00ff00ffLL; /*dd 000FF 00FFh, 000FF00FFh */
+static mmx_t MMX_FF00w = (mmx_t)(long long)0xff00ff00ff00ff00LL; /*dd 000FF 00FFh, 000FF00FFh */
static mmx_t MMX32_Vredcoeff = (mmx_t)(long long)0x0059005900590059LL;
static mmx_t MMX32_Ubluecoeff = (mmx_t)(long long)0x0072007200720072LL;
@@ -695,7 +695,7 @@ gst_colorspace_yuv_to_bgr32_mmx(tables, lum, cr, cb, out, rows, cols)
int cols, rows;
{
- guint32 *row1 = (guint32 *)out; // 32 bit target
+ guint32 *row1 = (guint32 *)out; /* 32 bit target */
int cols4 = cols>>2;
int y, x;
@@ -703,109 +703,109 @@ gst_colorspace_yuv_to_bgr32_mmx(tables, lum, cr, cb, out, rows, cols)
for (y=rows>>1; y; y--) {
for (x=cols4; x; x--) {
- // create Cr (result in mm1)
- movd_m2r(*(mmx_t *)cb, mm1); // 0 0 0 0 v3 v2 v1 v0
- pxor_r2r(mm7, mm7); // 00 00 00 00 00 00 00 00
- movd_m2r(*(mmx_t *)lum, mm2); // 0 0 0 0 l3 l2 l1 l0
- punpcklbw_r2r(mm7, mm1); // 0 v3 0 v2 00 v1 00 v0
- punpckldq_r2r(mm1, mm1); // 00 v1 00 v0 00 v1 00 v0
- psubw_m2r(MMX_80w, mm1); // mm1-128:r1 r1 r0 r0 r1 r1 r0 r0
-
- // create Cr_g (result in mm0)
- movq_r2r(mm1, mm0); // r1 r1 r0 r0 r1 r1 r0 r0
- pmullw_m2r(MMX32_Vgrncoeff, mm0); // red*-46dec=0.7136*64
- pmullw_m2r(MMX32_Vredcoeff, mm1); // red*89dec=1.4013*64
- psraw_i2r(6, mm0); // red=red/64
- psraw_i2r(6, mm1); // red=red/64
+ /* create Cr (result in mm1) */
+ movd_m2r(*(mmx_t *)cb, mm1); /* 0 0 0 0 v3 v2 v1 v0 */
+ pxor_r2r(mm7, mm7); /* 00 00 00 00 00 00 00 00 */
+ movd_m2r(*(mmx_t *)lum, mm2); /* 0 0 0 0 l3 l2 l1 l0 */
+ punpcklbw_r2r(mm7, mm1); /* 0 v3 0 v2 00 v1 00 v0 */
+ punpckldq_r2r(mm1, mm1); /* 00 v1 00 v0 00 v1 00 v0 */
+ psubw_m2r(MMX_80w, mm1); /* mm1-128:r1 r1 r0 r0 r1 r1 r0 r0 */
+
+ /* create Cr_g (result in mm0) */
+ movq_r2r(mm1, mm0); /* r1 r1 r0 r0 r1 r1 r0 r0 */
+ pmullw_m2r(MMX32_Vgrncoeff, mm0); /* red*-46dec=0.7136*64 */
+ pmullw_m2r(MMX32_Vredcoeff, mm1); /* red*89dec=1.4013*64 */
+ psraw_i2r(6, mm0); /* red=red/64 */
+ psraw_i2r(6, mm1); /* red=red/64 */
- // create L1 L2 (result in mm2,mm4)
- // L2=lum+cols
- movq_m2r(*(mmx_t *)(lum+cols),mm3); // 0 0 0 0 L3 L2 L1 L0
- punpckldq_r2r(mm3, mm2); // L3 L2 L1 L0 l3 l2 l1 l0
- movq_r2r(mm2, mm4); // L3 L2 L1 L0 l3 l2 l1 l0
- pand_m2r(MMX_FF00w, mm2); // L3 0 L1 0 l3 0 l1 0
- pand_m2r(MMX_00FFw, mm4); // 0 L2 0 L0 0 l2 0 l0
- psrlw_i2r(8, mm2); // 0 L3 0 L1 0 l3 0 l1
-
- // create R (result in mm6)
- movq_r2r(mm2, mm5); // 0 L3 0 L1 0 l3 0 l1
- movq_r2r(mm4, mm6); // 0 L2 0 L0 0 l2 0 l0
- paddsw_r2r(mm1, mm5); // lum1+red:x R3 x R1 x r3 x r1
- paddsw_r2r(mm1, mm6); // lum1+red:x R2 x R0 x r2 x r0
- packuswb_r2r(mm5, mm5); // R3 R1 r3 r1 R3 R1 r3 r1
- packuswb_r2r(mm6, mm6); // R2 R0 r2 r0 R2 R0 r2 r0
- pxor_r2r(mm7, mm7); // 00 00 00 00 00 00 00 00
- punpcklbw_r2r(mm5, mm6); // R3 R2 R1 R0 r3 r2 r1 r0
-
- // create Cb (result in mm1)
- movd_m2r(*(mmx_t *)cr, mm1); // 0 0 0 0 u3 u2 u1 u0
- punpcklbw_r2r(mm7, mm1); // 0 u3 0 u2 00 u1 00 u0
- punpckldq_r2r(mm1, mm1); // 00 u1 00 u0 00 u1 00 u0
- psubw_m2r(MMX_80w, mm1); // mm1-128:u1 u1 u0 u0 u1 u1 u0 u0
- // create Cb_g (result in mm5)
- movq_r2r(mm1, mm5); // u1 u1 u0 u0 u1 u1 u0 u0
- pmullw_m2r(MMX32_Ugrncoeff, mm5); // blue*-109dec=1.7129*64
- pmullw_m2r(MMX32_Ubluecoeff, mm1); // blue*114dec=1.78125*64
- psraw_i2r(6, mm5); // blue=red/64
- psraw_i2r(6, mm1); // blue=blue/64
-
- // create G (result in mm7)
- movq_r2r(mm2, mm3); // 0 L3 0 L1 0 l3 0 l1
- movq_r2r(mm4, mm7); // 0 L2 0 L0 0 l2 0 l1
- paddsw_r2r(mm5, mm3); // lum1+Cb_g:x G3t x G1t x g3t x g1t
- paddsw_r2r(mm5, mm7); // lum1+Cb_g:x G2t x G0t x g2t x g0t
- paddsw_r2r(mm0, mm3); // lum1+Cr_g:x G3 x G1 x g3 x g1
- paddsw_r2r(mm0, mm7); // lum1+blue:x G2 x G0 x g2 x g0
- packuswb_r2r(mm3, mm3); // G3 G1 g3 g1 G3 G1 g3 g1
- packuswb_r2r(mm7, mm7); // G2 G0 g2 g0 G2 G0 g2 g0
- punpcklbw_r2r(mm3, mm7); // G3 G2 G1 G0 g3 g2 g1 g0
-
- // create B (result in mm5)
- movq_r2r(mm2, mm3); // 0 L3 0 L1 0 l3 0 l1
- movq_r2r(mm4, mm5); // 0 L2 0 L0 0 l2 0 l1
- paddsw_r2r(mm1, mm3); // lum1+blue:x B3 x B1 x b3 x b1
- paddsw_r2r(mm1, mm5); // lum1+blue:x B2 x B0 x b2 x b0
- packuswb_r2r(mm3, mm3); // B3 B1 b3 b1 B3 B1 b3 b1
- packuswb_r2r(mm5, mm5); // B2 B0 b2 b0 B2 B0 b2 b0
- punpcklbw_r2r(mm3, mm5); // B3 B2 B1 B0 b3 b2 b1 b0
-
- // fill destination row1 (needed are mm6=Rr,mm7=Gg,mm5=Bb)
-
- pxor_r2r(mm2, mm2); // 0 0 0 0 0 0 0 0
- pxor_r2r(mm4, mm4); // 0 0 0 0 0 0 0 0
- movq_r2r(mm6, mm1); // R3 R2 R1 R0 r3 r2 r1 r0
- movq_r2r(mm5, mm3); // B3 B2 B1 B0 b3 b2 b1 b0
- // process lower lum
- punpcklbw_r2r(mm4, mm1); // 0 r3 0 r2 0 r1 0 r0
- punpcklbw_r2r(mm4, mm3); // 0 b3 0 b2 0 b1 0 b0
- movq_r2r(mm1, mm2); // 0 r3 0 r2 0 r1 0 r0
- movq_r2r(mm3, mm0); // 0 b3 0 b2 0 b1 0 b0
- punpcklwd_r2r(mm1, mm3); // 0 r1 0 b1 0 r0 0 b0
- punpckhwd_r2r(mm2, mm0); // 0 r3 0 b3 0 r2 0 b2
-
- pxor_r2r(mm2, mm2); // 0 0 0 0 0 0 0 0
- movq_r2r(mm7, mm1); // G3 G2 G1 G0 g3 g2 g1 g0
- punpcklbw_r2r(mm1, mm2); // g3 0 g2 0 g1 0 g0 0
- punpcklwd_r2r(mm4, mm2); // 0 0 g1 0 0 0 g0 0
- por_r2r(mm3, mm2); // 0 r1 g1 b1 0 r0 g0 b0
- movq_r2m(mm2, *(mmx_t *)row1); // wrote out ! row1
-
- pxor_r2r(mm2, mm2); // 0 0 0 0 0 0 0 0
- punpcklbw_r2r(mm1, mm4); // g3 0 g2 0 g1 0 g0 0
- punpckhwd_r2r(mm2, mm4); // 0 0 g3 0 0 0 g2 0
- por_r2r(mm0, mm4); // 0 r3 g3 b3 0 r2 g2 b2
- movq_r2m(mm4, *(mmx_t *)(row1+2)); // wrote out ! row1
+ /* create L1 L2 (result in mm2,mm4) */
+ /* L2=lum+cols */
+ movq_m2r(*(mmx_t *)(lum+cols),mm3); /* 0 0 0 0 L3 L2 L1 L0 */
+ punpckldq_r2r(mm3, mm2); /* L3 L2 L1 L0 l3 l2 l1 l0 */
+ movq_r2r(mm2, mm4); /* L3 L2 L1 L0 l3 l2 l1 l0 */
+ pand_m2r(MMX_FF00w, mm2); /* L3 0 L1 0 l3 0 l1 0 */
+ pand_m2r(MMX_00FFw, mm4); /* 0 L2 0 L0 0 l2 0 l0 */
+ psrlw_i2r(8, mm2); /* 0 L3 0 L1 0 l3 0 l1 */
+
+ /* create R (result in mm6) */
+ movq_r2r(mm2, mm5); /* 0 L3 0 L1 0 l3 0 l1 */
+ movq_r2r(mm4, mm6); /* 0 L2 0 L0 0 l2 0 l0 */
+ paddsw_r2r(mm1, mm5); /* lum1+red:x R3 x R1 x r3 x r1 */
+ paddsw_r2r(mm1, mm6); /* lum1+red:x R2 x R0 x r2 x r0 */
+ packuswb_r2r(mm5, mm5); /* R3 R1 r3 r1 R3 R1 r3 r1 */
+ packuswb_r2r(mm6, mm6); /* R2 R0 r2 r0 R2 R0 r2 r0 */
+ pxor_r2r(mm7, mm7); /* 00 00 00 00 00 00 00 00 */
+ punpcklbw_r2r(mm5, mm6); /* R3 R2 R1 R0 r3 r2 r1 r0 */
+
+ /* create Cb (result in mm1) */
+ movd_m2r(*(mmx_t *)cr, mm1); /* 0 0 0 0 u3 u2 u1 u0 */
+ punpcklbw_r2r(mm7, mm1); /* 0 u3 0 u2 00 u1 00 u0 */
+ punpckldq_r2r(mm1, mm1); /* 00 u1 00 u0 00 u1 00 u0 */
+ psubw_m2r(MMX_80w, mm1); /* mm1-128:u1 u1 u0 u0 u1 u1 u0 u0 */
+ /* create Cb_g (result in mm5) */
+ movq_r2r(mm1, mm5); /* u1 u1 u0 u0 u1 u1 u0 u0 */
+ pmullw_m2r(MMX32_Ugrncoeff, mm5); /* blue*-109dec=1.7129*64 */
+ pmullw_m2r(MMX32_Ubluecoeff, mm1); /* blue*114dec=1.78125*64 */
+ psraw_i2r(6, mm5); /* blue=red/64 */
+ psraw_i2r(6, mm1); /* blue=blue/64 */
+
+ /* create G (result in mm7) */
+ movq_r2r(mm2, mm3); /* 0 L3 0 L1 0 l3 0 l1 */
+ movq_r2r(mm4, mm7); /* 0 L2 0 L0 0 l2 0 l1 */
+ paddsw_r2r(mm5, mm3); /* lum1+Cb_g:x G3t x G1t x g3t x g1t */
+ paddsw_r2r(mm5, mm7); /* lum1+Cb_g:x G2t x G0t x g2t x g0t */
+ paddsw_r2r(mm0, mm3); /* lum1+Cr_g:x G3 x G1 x g3 x g1 */
+ paddsw_r2r(mm0, mm7); /* lum1+blue:x G2 x G0 x g2 x g0 */
+ packuswb_r2r(mm3, mm3); /* G3 G1 g3 g1 G3 G1 g3 g1 */
+ packuswb_r2r(mm7, mm7); /* G2 G0 g2 g0 G2 G0 g2 g0 */
+ punpcklbw_r2r(mm3, mm7); /* G3 G2 G1 G0 g3 g2 g1 g0 */
+
+ /* create B (result in mm5) */
+ movq_r2r(mm2, mm3); /* 0 L3 0 L1 0 l3 0 l1 */
+ movq_r2r(mm4, mm5); /* 0 L2 0 L0 0 l2 0 l1 */
+ paddsw_r2r(mm1, mm3); /* lum1+blue:x B3 x B1 x b3 x b1 */
+ paddsw_r2r(mm1, mm5); /* lum1+blue:x B2 x B0 x b2 x b0 */
+ packuswb_r2r(mm3, mm3); /* B3 B1 b3 b1 B3 B1 b3 b1 */
+ packuswb_r2r(mm5, mm5); /* B2 B0 b2 b0 B2 B0 b2 b0 */
+ punpcklbw_r2r(mm3, mm5); /* B3 B2 B1 B0 b3 b2 b1 b0 */
+
+ /* fill destination row1 (needed are mm6=Rr,mm7=Gg,mm5=Bb) */
+
+ pxor_r2r(mm2, mm2); /* 0 0 0 0 0 0 0 0 */
+ pxor_r2r(mm4, mm4); /* 0 0 0 0 0 0 0 0 */
+ movq_r2r(mm6, mm1); /* R3 R2 R1 R0 r3 r2 r1 r0 */
+ movq_r2r(mm5, mm3); /* B3 B2 B1 B0 b3 b2 b1 b0 */
+ /* process lower lum */
+ punpcklbw_r2r(mm4, mm1); /* 0 r3 0 r2 0 r1 0 r0 */
+ punpcklbw_r2r(mm4, mm3); /* 0 b3 0 b2 0 b1 0 b0 */
+ movq_r2r(mm1, mm2); /* 0 r3 0 r2 0 r1 0 r0 */
+ movq_r2r(mm3, mm0); /* 0 b3 0 b2 0 b1 0 b0 */
+ punpcklwd_r2r(mm1, mm3); /* 0 r1 0 b1 0 r0 0 b0 */
+ punpckhwd_r2r(mm2, mm0); /* 0 r3 0 b3 0 r2 0 b2 */
+
+ pxor_r2r(mm2, mm2); /* 0 0 0 0 0 0 0 0 */
+ movq_r2r(mm7, mm1); /* G3 G2 G1 G0 g3 g2 g1 g0 */
+ punpcklbw_r2r(mm1, mm2); /* g3 0 g2 0 g1 0 g0 0 */
+ punpcklwd_r2r(mm4, mm2); /* 0 0 g1 0 0 0 g0 0 */
+ por_r2r(mm3, mm2); /* 0 r1 g1 b1 0 r0 g0 b0 */
+ movq_r2m(mm2, *(mmx_t *)row1); /* wrote out ! row1 */
+
+ pxor_r2r(mm2, mm2); /* 0 0 0 0 0 0 0 0 */
+ punpcklbw_r2r(mm1, mm4); /* g3 0 g2 0 g1 0 g0 0 */
+ punpckhwd_r2r(mm2, mm4); /* 0 0 g3 0 0 0 g2 0 */
+ por_r2r(mm0, mm4); /* 0 r3 g3 b3 0 r2 g2 b2 */
+ movq_r2m(mm4, *(mmx_t *)(row1+2)); /* wrote out ! row1 */
- // fill destination row2 (needed are mm6=Rr,mm7=Gg,mm5=Bb)
- // this can be done "destructive"
- pxor_r2r(mm2, mm2); // 0 0 0 0 0 0 0 0
- punpckhbw_r2r(mm2, mm6); // 0 R3 0 R2 0 R1 0 R0
- punpckhbw_r2r(mm1, mm5); // G3 B3 G2 B2 G1 B1 G0 B0
- movq_r2r(mm5, mm1); // G3 B3 G2 B2 G1 B1 G0 B0
- punpcklwd_r2r(mm6, mm1); // 0 R1 G1 B1 0 R0 G0 B0
- movq_r2m(mm1, *(mmx_t *)(row1+cols)); // wrote out ! row2
- punpckhwd_r2r(mm6, mm5); // 0 R3 G3 B3 0 R2 G2 B2
- movq_r2m(mm5, *(mmx_t *)(row1+cols+2)); // wrote out ! row2
+ /* fill destination row2 (needed are mm6=Rr,mm7=Gg,mm5=Bb) */
+ /* this can be done "destructive" */
+ pxor_r2r(mm2, mm2); /* 0 0 0 0 0 0 0 0 */
+ punpckhbw_r2r(mm2, mm6); /* 0 R3 0 R2 0 R1 0 R0 */
+ punpckhbw_r2r(mm1, mm5); /* G3 B3 G2 B2 G1 B1 G0 B0 */
+ movq_r2r(mm5, mm1); /* G3 B3 G2 B2 G1 B1 G0 B0 */
+ punpcklwd_r2r(mm6, mm1); /* 0 R1 G1 B1 0 R0 G0 B0 */
+ movq_r2m(mm1, *(mmx_t *)(row1+cols)); /* wrote out ! row2 */
+ punpckhwd_r2r(mm6, mm5); /* 0 R3 G3 B3 0 R2 G2 B2 */
+ movq_r2m(mm5, *(mmx_t *)(row1+cols+2)); /* wrote out ! row2 */
lum+=4;
cr+=2;
diff --git a/ext/hermes/yuv2yuv.c b/ext/hermes/yuv2yuv.c
index bec60c8a..4f13a9d4 100644
--- a/ext/hermes/yuv2yuv.c
+++ b/ext/hermes/yuv2yuv.c
@@ -24,7 +24,7 @@
#include <gst/gst.h>
-//#undef HAVE_LIBMMX
+/*#undef HAVE_LIBMMX */
#ifdef HAVE_LIBMMX
#include "mmx.h"
diff --git a/ext/jack/Makefile.am b/ext/jack/Makefile.am
index fc5c110d..7c1b5c23 100644
--- a/ext/jack/Makefile.am
+++ b/ext/jack/Makefile.am
@@ -4,7 +4,7 @@ plugin_LTLIBRARIES = libgstjack.la
libgstjack_la_SOURCES = gstjack.c
libgstjack_la_CFLAGS = $(GST_CFLAGS) $(JACK_CFLAGS)
-libgstjack_la_LIBADD = $(GST_LIBS) $(JACK_LIBS)
+libgstjack_la_LIBADD = $(JACK_LIBS)
libgstjack_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = gstjack.h
diff --git a/ext/jack/gstjack.c b/ext/jack/gstjack.c
index 82da2aee..816c5036 100644
--- a/ext/jack/gstjack.c
+++ b/ext/jack/gstjack.c
@@ -259,7 +259,7 @@ gst_jack_request_new_pad (GstElement *element, GstPadTemplate *templ, const gcha
if (this->client)
*pad_list = g_list_append (*pad_list, pad);
-// this->pads = g_list_append (this->pads, pad);
+/* this->pads = g_list_append (this->pads, pad); */
return pad->pad;
}
@@ -555,7 +555,7 @@ shutdown (void *arg)
{
GstJackClient *client = (GstJackClient*) arg;
printf ("shutdown\n");
-// gst_element_set_state (GST_ELEMENT (client->manager), GST_STATE_READY);
+/* gst_element_set_state (GST_ELEMENT (client->manager), GST_STATE_READY); */
}
static gboolean
diff --git a/ext/ladspa/Makefile.am b/ext/ladspa/Makefile.am
index 6941b5a4..e0fe26b6 100644
--- a/ext/ladspa/Makefile.am
+++ b/ext/ladspa/Makefile.am
@@ -4,7 +4,7 @@ plugin_LTLIBRARIES = libgstladspa.la
libgstladspa_la_SOURCES = gstladspa.c search.c load.c
libgstladspa_la_CFLAGS = $(GST_CFLAGS)
-libgstladspa_la_LIBADD = $(GST_LIBS)
+libgstladspa_la_LIBADD =
libgstladspa_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = gstladspa.h ladspa.h utils.h
diff --git a/ext/ladspa/gstladspa.c b/ext/ladspa/gstladspa.c
index b6727255..0eab11cd 100644
--- a/ext/ladspa/gstladspa.c
+++ b/ext/ladspa/gstladspa.c
@@ -492,7 +492,7 @@ gst_ladspa_set_property (GObject *object, guint prop_id, const GValue *value, GP
/*
if (id == ARG_LOOP_BASED) {
- // we can only do this in NULL state
+ * we can only do this in NULL state *
g_return_if_fail (GST_STATE(object) != GST_STATE_NULL);
ladspa->loopbased = g_value_get_boolean (value);
if (ladspa->loopbased) {
diff --git a/ext/ladspa/search.c b/ext/ladspa/search.c
index 31940474..67c42361 100644
--- a/ext/ladspa/search.c
+++ b/ext/ladspa/search.c
@@ -98,9 +98,9 @@ LADSPAPluginSearch(LADSPAPluginSearchCallbackFunction fCallbackFunction) {
pcLADSPAPath = getenv("LADSPA_PATH");
if (!pcLADSPAPath) {
-// fprintf(stderr,
-// "Warning: You do not have a LADSPA_PATH "
-// "environment variable set.\n");
+/* fprintf(stderr, */
+/* "Warning: You do not have a LADSPA_PATH " */
+/* "environment variable set.\n"); */
return;
}
diff --git a/ext/sdl/Makefile.am b/ext/sdl/Makefile.am
index f57c0247..7191711b 100644
--- a/ext/sdl/Makefile.am
+++ b/ext/sdl/Makefile.am
@@ -5,7 +5,7 @@ plugin_LTLIBRARIES = libsdlvideosink.la
libsdlvideosink_la_SOURCES = sdlvideosink.c
## FIXME I have my doubts about these opti flags
libsdlvideosink_la_CFLAGS = $(GST_CFLAGS) $(SDL_CFLAGS) -ffast-math -finline-functions
-libsdlvideosink_la_LIBADD = $(GST_LIBS) $(SDL_LIBS)
+libsdlvideosink_la_LIBADD = $(SDL_LIBS)
libsdlvideosink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = sdlvideosink.h
diff --git a/ext/shout/Makefile.am b/ext/shout/Makefile.am
index ebdc864a..95e68919 100644
--- a/ext/shout/Makefile.am
+++ b/ext/shout/Makefile.am
@@ -4,7 +4,7 @@ plugin_LTLIBRARIES = libgstshout.la
libgstshout_la_SOURCES = gstshout.c
libgstshout_la_CFLAGS = $(GST_CFLAGS)
-libgstshout_la_LIBADD = $(GST_LIBS) $(SHOUT_LIBS)
+libgstshout_la_LIBADD = $(SHOUT_LIBS)
libgstshout_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = gstshout.h
diff --git a/ext/shout/gstshout.c b/ext/shout/gstshout.c
index a4e0cfaa..13d93226 100644
--- a/ext/shout/gstshout.c
+++ b/ext/shout/gstshout.c
@@ -95,7 +95,7 @@ static void gst_icecastsend_get_property (GObject *object, guint prop_id, GVa
static GstElementStateReturn gst_icecastsend_change_state (GstElement *element);
static GstElementClass *parent_class = NULL;
-//static guint gst_icecastsend_signals[LAST_SIGNAL] = { 0 };
+/*static guint gst_icecastsend_signals[LAST_SIGNAL] = { 0 }; */
GType
gst_icecastsend_get_type(void)
@@ -131,57 +131,57 @@ gst_icecastsend_class_init (GstIcecastSendClass *klass)
g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_IP,
g_param_spec_string("ip","ip","ip",
- NULL, G_PARAM_READWRITE)); // CHECKME
+ NULL, G_PARAM_READWRITE)); /* CHECKME */
g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_PORT,
g_param_spec_int("port","port","port",
- G_MININT,G_MAXINT,0,G_PARAM_READWRITE)); // CHECKME
+ G_MININT,G_MAXINT,0,G_PARAM_READWRITE)); /* CHECKME */
g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_PASSWORD,
g_param_spec_string("password","password","password",
- NULL, G_PARAM_READWRITE)); // CHECKME
+ NULL, G_PARAM_READWRITE)); /* CHECKME */
g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_PUBLIC,
g_param_spec_boolean("public","public","public",
- TRUE, G_PARAM_READWRITE)); // CHECKME
+ TRUE, G_PARAM_READWRITE)); /* CHECKME */
- // metadata
+ /* metadata */
g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_NAME,
g_param_spec_string("name","name","name",
- NULL, G_PARAM_READWRITE)); // CHECKME
+ NULL, G_PARAM_READWRITE)); /* CHECKME */
g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_DESCRIPTION,
g_param_spec_string("description","description","description",
- NULL, G_PARAM_READWRITE)); // CHECKME
+ NULL, G_PARAM_READWRITE)); /* CHECKME */
g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_GENRE,
g_param_spec_string("genre","genre","genre",
- NULL, G_PARAM_READWRITE)); // CHECKME
+ NULL, G_PARAM_READWRITE)); /* CHECKME */
- // icecast only
+ /* icecast only */
g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_MOUNT,
g_param_spec_string("mount","mount","mount",
- NULL, G_PARAM_READWRITE)); // CHECKME
+ NULL, G_PARAM_READWRITE)); /* CHECKME */
g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_DUMPFILE,
g_param_spec_string("dumpfile","dumpfile","dumpfile",
- NULL, G_PARAM_READWRITE)); // CHECKME
+ NULL, G_PARAM_READWRITE)); /* CHECKME */
- // shoutcast only
+ /* shoutcast only */
g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_ICY,
g_param_spec_boolean("icy","icy","icy",
- FALSE, G_PARAM_READWRITE)); // CHECKME
+ FALSE, G_PARAM_READWRITE)); /* CHECKME */
g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_AIM,
g_param_spec_string("aim","aim","aim",
- NULL, G_PARAM_READWRITE)); // CHECKME
+ NULL, G_PARAM_READWRITE)); /* CHECKME */
g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_ICQ,
g_param_spec_string("icq","icq","icq",
- NULL, G_PARAM_READWRITE)); // CHECKME
+ NULL, G_PARAM_READWRITE)); /* CHECKME */
g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_IRC,
g_param_spec_string("irc","irc","irc",
- NULL, G_PARAM_READWRITE)); // CHECKME
+ NULL, G_PARAM_READWRITE)); /* CHECKME */
gobject_class->set_property = gst_icecastsend_set_property;
@@ -405,10 +405,10 @@ gst_icecastsend_change_state (GstElement *element)
case GST_STATE_NULL_TO_READY:
shout_init_connection (&icecastsend->conn);
- // --- FIXME: shout requires an ip, and fails if it is given a host.
- // may want to put convert_to_ip(icecastsend->ip) here
+ /* --- FIXME: shout requires an ip, and fails if it is given a host. */
+ /* may want to put convert_to_ip(icecastsend->ip) here */
icecastsend->conn.ip = icecastsend->ip;
- // ---
+ /* --- */
icecastsend->conn.port = icecastsend->port;
icecastsend->conn.password = icecastsend->password;
@@ -427,7 +427,7 @@ gst_icecastsend_change_state (GstElement *element)
g_print ("connected to server...\n");
}
else {
- // changed from g_warning, and included result code lookup.
+ /* changed from g_warning, and included result code lookup. */
g_error ("couldn't connect to server... (%i: %s)\n", icecastsend->conn.error, SHOUT_ERRORS[icecastsend->conn.error]);
shout_disconnect (&icecastsend->conn);
return GST_STATE_FAILURE;
diff --git a/ext/smoothwave/Makefile.am b/ext/smoothwave/Makefile.am
index 6f62dc8a..c6a67abc 100644
--- a/ext/smoothwave/Makefile.am
+++ b/ext/smoothwave/Makefile.am
@@ -4,7 +4,7 @@ plugin_LTLIBRARIES = libgstsmoothwave.la
libgstsmoothwave_la_SOURCES = gstsmoothwave.c
libgstsmoothwave_la_CFLAGS = $(GST_CFLAGS) $(GTK_CFLAGS)
-libgstsmoothwave_la_LIBADD = $(GST_LIBS) $(GTK_LIBS)
+libgstsmoothwave_la_LIBADD = $(GTK_LIBS)
libgstsmoothwave_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = gstsmoothwave.h
diff --git a/ext/smoothwave/gstsmoothwave.c b/ext/smoothwave/gstsmoothwave.c
index befdba1d..d6d19200 100644
--- a/ext/smoothwave/gstsmoothwave.c
+++ b/ext/smoothwave/gstsmoothwave.c
@@ -55,7 +55,7 @@ static void gst_smoothwave_get_property (GObject *object, guint prop_id, GValue
static void gst_smoothwave_chain (GstPad *pad, GstBuffer *buf);
static GstElementClass *parent_class = NULL;
-//static guint gst_smoothwave_signals[LAST_SIGNAL] = { 0 };
+/*static guint gst_smoothwave_signals[LAST_SIGNAL] = { 0 }; */
GType
@@ -92,13 +92,13 @@ gst_smoothwave_class_init (GstSmoothWaveClass *klass)
g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_WIDTH,
g_param_spec_int("width","width","width",
- G_MININT,G_MAXINT,0,G_PARAM_READWRITE)); // CHECKME
+ G_MININT,G_MAXINT,0,G_PARAM_READWRITE)); /* CHECKME */
g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_HEIGHT,
g_param_spec_int("height","height","height",
- G_MININT,G_MAXINT,0,G_PARAM_READWRITE)); // CHECKME
+ G_MININT,G_MAXINT,0,G_PARAM_READWRITE)); /* CHECKME */
g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_WIDGET,
g_param_spec_object("widget","widget","widget",
- GTK_TYPE_WIDGET,G_PARAM_READABLE)); // CHECKME!
+ GTK_TYPE_WIDGET,G_PARAM_READABLE)); /* CHECKME! */
gobject_class->set_property = gst_smoothwave_set_property;
gobject_class->get_property = gst_smoothwave_get_property;
@@ -116,21 +116,21 @@ gst_smoothwave_init (GstSmoothWave *smoothwave)
smoothwave->srcpad = gst_pad_new("src",GST_PAD_SRC);
gst_element_add_pad(GST_ELEMENT(smoothwave),smoothwave->srcpad);
-// smoothwave->meta = NULL;
+/* smoothwave->meta = NULL; */
smoothwave->width = 512;
smoothwave->height = 256;
gdk_rgb_init();
-// gtk_widget_set_default_colormap (gdk_rgb_get_cmap());
-// gtk_widget_set_default_visual (gdk_rgb_get_visual());
+/* gtk_widget_set_default_colormap (gdk_rgb_get_cmap()); */
+/* gtk_widget_set_default_visual (gdk_rgb_get_visual()); */
-// GST_DEBUG (0,"creating palette\n");
+/* GST_DEBUG (0,"creating palette\n"); */
for (i=0;i<256;i++)
palette[i] = (i << 16) || (i << 8);
-// GST_DEBUG (0,"creating cmap\n");
+/* GST_DEBUG (0,"creating cmap\n"); */
smoothwave->cmap = gdk_rgb_cmap_new(palette,256);
-// GST_DEBUG (0,"created cmap\n");
-// gtk_widget_set_default_colormap (smoothwave->cmap);
+/* GST_DEBUG (0,"created cmap\n"); */
+/* gtk_widget_set_default_colormap (smoothwave->cmap); */
smoothwave->image = gtk_drawing_area_new();
gtk_drawing_area_size(GTK_DRAWING_AREA(smoothwave->image),
@@ -153,29 +153,29 @@ gst_smoothwave_chain (GstPad *pad, GstBuffer *buf)
g_return_if_fail(pad != NULL);
g_return_if_fail(GST_IS_PAD(pad));
g_return_if_fail(buf != NULL);
-// g_return_if_fail(GST_IS_BUFFER(buf));
+/* g_return_if_fail(GST_IS_BUFFER(buf)); */
smoothwave = GST_SMOOTHWAVE(GST_OBJECT_PARENT (pad));
/* first deal with audio metadata */
-// if (buf->meta) {
-// if (smoothwave->meta != NULL) {
-// /* FIXME: need to unref the old metadata so it goes away */
-// }
-// /* we just make a copy of the pointer */
-// smoothwave->meta = (MetaAudioRaw *)(buf->meta);
-// /* FIXME: now we have to ref the metadata so it doesn't go away */
-// }
+/* if (buf->meta) { */
+/* if (smoothwave->meta != NULL) { */
+/* /* FIXME: need to unref the old metadata so it goes away */ */
+/* } */
+/* /* we just make a copy of the pointer */ */
+/* smoothwave->meta = (MetaAudioRaw *)(buf->meta); */
+/* /* FIXME: now we have to ref the metadata so it doesn't go away */ */
+/* } */
-// g_return_if_fail(smoothwave->meta != NULL);
+/* g_return_if_fail(smoothwave->meta != NULL); */
samples = (gint16 *)GST_BUFFER_DATA(buf);
-// samplecount = buf->datasize / (smoothwave->meta->channels * sizeof(gint16));
+/* samplecount = buf->datasize / (smoothwave->meta->channels * sizeof(gint16)); */
samplecount = GST_BUFFER_SIZE(buf) / (2 * sizeof(gint16));
qheight = smoothwave->height/4;
-// GST_DEBUG (0,"traversing %d\n",smoothwave->width);
+/* GST_DEBUG (0,"traversing %d\n",smoothwave->width); */
for (i=0;i<MAX(smoothwave->width,samplecount);i++) {
gint16 y1 = (gint32)(samples[i*2] * qheight) / 32768 +
qheight;
@@ -183,7 +183,7 @@ gst_smoothwave_chain (GstPad *pad, GstBuffer *buf)
(qheight*3);
smoothwave->imagebuffer[y1*smoothwave->width + i] = 0xff;
smoothwave->imagebuffer[y2*smoothwave->width + i] = 0xff;
-// smoothwave->imagebuffer[i+(smoothwave->width*5)] = i;
+/* smoothwave->imagebuffer[i+(smoothwave->width*5)] = i; */
}
ptr = (guint32 *)smoothwave->imagebuffer;
@@ -194,7 +194,7 @@ gst_smoothwave_chain (GstPad *pad, GstBuffer *buf)
ptr++;
}
-// GST_DEBUG (0,"drawing\n");
+/* GST_DEBUG (0,"drawing\n"); */
/* GST_DEBUG (0,"gdk_draw_indexed_image(%p,%p,%d,%d,%d,%d,%s,%p,%d,%p);\n",
smoothwave->image->window,
smoothwave->image->style->fg_gc[GTK_STATE_NORMAL],
@@ -214,7 +214,7 @@ gst_smoothwave_chain (GstPad *pad, GstBuffer *buf)
GDK_RGB_DITHER_NORMAL,
smoothwave->imagebuffer,smoothwave->width);
-// gst_trace_add_entry(NULL,0,buf,"smoothwave: calculated smoothwave");
+/* gst_trace_add_entry(NULL,0,buf,"smoothwave: calculated smoothwave"); */
gst_buffer_unref(buf);
}
diff --git a/ext/tarkin/Makefile.am b/ext/tarkin/Makefile.am
index a10409fc..6bfe71b1 100644
--- a/ext/tarkin/Makefile.am
+++ b/ext/tarkin/Makefile.am
@@ -9,7 +9,7 @@ libgsttarkin_la_SOURCES = tarkin.c \
libgsttarkin_la_CFLAGS = $(GST_CFLAGS) $(VORBIS_CFLAGS) -DTYPE_BITS=10 -DTYPE=int16_t -DRLECODER
## AM_PATH_VORBIS also sets VORBISENC_LIBS
-libgsttarkin_la_LIBADD = $(GST_LIBS) $(VORBIS_LIBS) $(VORBISENC_LIBS)
+libgsttarkin_la_LIBADD = $(VORBIS_LIBS) $(VORBISENC_LIBS)
libgsttarkin_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = gsttarkinenc.h mem.h tarkin.h yuv.h wavelet.h
diff --git a/ext/tarkin/bitcoder.h b/ext/tarkin/bitcoder.h
index f0b8cd69..312cd887 100644
--- a/ext/tarkin/bitcoder.h
+++ b/ext/tarkin/bitcoder.h
@@ -73,8 +73,8 @@ uint32_t bitcoder_flush (BitCoderState *s)
if (s->bit_count > 0 && s->byte_count < s->limit)
s->bitstream [s->byte_count++] = s->byte << (8 - s->bit_count);
-//printf ("%s: %i bytes written.\n", __FUNCTION__, s->byte_count);
-//printf ("%s: last bit %i\n", __FUNCTION__, s->bit_count);
+/*printf ("%s: %i bytes written.\n", __FUNCTION__, s->byte_count); */
+/*printf ("%s: last bit %i\n", __FUNCTION__, s->bit_count); */
return s->byte_count;
}
diff --git a/ext/tarkin/golomb.h b/ext/tarkin/golomb.h
index fa66d750..95e63c30 100644
--- a/ext/tarkin/golomb.h
+++ b/ext/tarkin/golomb.h
@@ -20,7 +20,7 @@ unsigned int required_bits (unsigned int x)
static inline
void write_number_binary (BitCoderState *b, unsigned int x, int bits, int u)
{
-//printf ("wrote %i with %i bits (%i+%i)\n", x, u+bits, u, bits);
+/*printf ("wrote %i with %i bits (%i+%i)\n", x, u+bits, u, bits); */
while (bits) {
bits--;
bitcoder_write_bit (b, (x >> bits) & 1);
diff --git a/ext/tarkin/info.c b/ext/tarkin/info.c
index e555e381..7937a69f 100644
--- a/ext/tarkin/info.c
+++ b/ext/tarkin/info.c
@@ -270,7 +270,7 @@ static int _tarkin_unpack_layer_desc(TarkinInfo *vi,oggpack_buffer *opb){
}
vi->max_bitstream_len += layer->desc.bitstream_len
- + 2 * 10 * sizeof(uint32_t) * layer->n_comp; // truncation tables
+ + 2 * 10 * sizeof(uint32_t) * layer->n_comp; /* truncation tables */
#ifdef DBG_OGG
printf("\n layer%d: size %dx%dx%d, format %d, a_m %d, s_m %d, %d fpb\n",
diff --git a/ext/tarkin/tarkin.c b/ext/tarkin/tarkin.c
index 053c03f7..1804fc5f 100644
--- a/ext/tarkin/tarkin.c
+++ b/ext/tarkin/tarkin.c
@@ -139,7 +139,7 @@ extern int tarkin_analysis_add_layer(TarkinStream *s,
}
/*
max_bitstream_len += layer->desc.bitstream_len
- + 2 * 10 * sizeof(uint32_t) * layer->n_comp; // truncation tables
+ + 2 * 10 * sizeof(uint32_t) * layer->n_comp; /* truncation tables */
*/
return (TARKIN_OK);
}
diff --git a/ext/tarkin/wavelet_coeff.c b/ext/tarkin/wavelet_coeff.c
index 2cc0a8f0..63248676 100644
--- a/ext/tarkin/wavelet_coeff.c
+++ b/ext/tarkin/wavelet_coeff.c
@@ -57,13 +57,13 @@ TYPE decode_coeff (ENTROPY_CODER significand_bitstream [],
do {
i--;
significance |= INPUT_BIT(&significand_bitstream[i]) << i;
-// if (ENTROPY_CODER_EOS(&significand_bitstream[i]))
-// return 0;
+/* if (ENTROPY_CODER_EOS(&significand_bitstream[i])) */
+/* return 0; */
} while (!significance && i > 0);
sign = INPUT_BIT(&significand_bitstream[i]);
-// if (ENTROPY_CODER_EOS(&significand_bitstream[i]))
-// return 0;
+/* if (ENTROPY_CODER_EOS(&significand_bitstream[i])) */
+/* return 0; */
while (--i >= 0)
significance |= INPUT_BIT(&insignificand_bitstream[i]) << i;
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-07 12:33:07 +0000