From f6c63f0d8e2ecf2bdc576f5c736e39698829f7cf Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Tue, 19 Mar 2002 04:10:05 +0000 Subject: [PATCH] removal of //-style comments don't link plugins to core libs -- the versioning is done internally to the plugins with... Original commit message from CVS: * removal of //-style comments * don't link plugins to core libs -- the versioning is done internally to the plugins with the plugin_info struct, and symbol resolution is lazy, so we can always know if a plugin can be loaded by the plugin_info data. in theory. --- examples/gob/Makefile.am | 2 +- ext/a52dec/Makefile.am | 2 +- ext/dvdread/Makefile.am | 2 +- ext/dvdread/demo-play.c | 10 +- ext/dvdread/dvdsrc.c | 16 +- ext/dvdread/dvdsrc.h | 2 +- ext/lame/Makefile.am | 2 +- ext/lame/gstlame.c | 62 +- ext/mad/Makefile.am | 2 +- ext/mpeg2dec/Makefile.am | 4 +- ext/mpeg2dec/gstmpeg2dec.c | 2 +- ext/sidplay/Makefile.am | 2 +- gst-libs/gst/audio/Makefile.am | 2 +- gst-libs/gst/audio/audio.c | 2 +- gst-libs/gst/idct/Makefile.am | 2 +- gst-libs/gst/idct/ieeetest.c | 2 +- gst-libs/gst/idct/mmx32idct.c | 930 ++++++++++++------------- gst-libs/gst/resample/Makefile.am | 2 +- gst-libs/gst/resample/dtos.c | 4 +- gst-libs/gst/resample/functable.c | 58 +- gst-libs/gst/resample/resample.c | 40 +- gst-libs/gst/resample/test.c | 34 +- gst-libs/gst/riff/Makefile.am | 2 +- gst-libs/gst/riff/riff.c | 38 +- gst-libs/gst/riff/riffencode.c | 2 +- gst-libs/gst/riff/riffparse.c | 32 +- gst-libs/gst/riff/riffutil.c | 2 +- gst/ac3parse/Makefile.am | 2 +- gst/mpegaudioparse/Makefile.am | 4 +- gst/mpegaudioparse/gstmp3types.c | 2 +- gst/mpegaudioparse/gstmpegaudioparse.c | 60 +- gst/mpegaudioparse/gstmpegaudioparse.h | 2 +- gst/mpegstream/Makefile.am | 2 +- gst/synaesthesia/Makefile.am | 2 +- gst/synaesthesia/gstsynaesthesia.c | 8 +- gst/synaesthesia/synaescope.c | 38 +- 36 files changed, 690 insertions(+), 690 deletions(-) diff --git a/examples/gob/Makefile.am b/examples/gob/Makefile.am index bd0b916e26..3b57967f5f 100644 --- a/examples/gob/Makefile.am +++ b/examples/gob/Makefile.am @@ -10,7 +10,7 @@ BUILT_SOURCES = \ libgstidentity2_la_SOURCES = gst-identity2.gob $(GOB_FILES_ID) libgstidentity2_la_CFLAGS = $(GST_CFLAGS) -libgstidentity2_la_LIBADD = $(GST_LIBS) +libgstidentity2_la_LIBADD = %.c %.h %-private.h: %.gob gob $< diff --git a/ext/a52dec/Makefile.am b/ext/a52dec/Makefile.am index 069c98d4da..f8b0fb1a0a 100644 --- a/ext/a52dec/Makefile.am +++ b/ext/a52dec/Makefile.am @@ -10,7 +10,7 @@ endif libgsta52dec_la_SOURCES = gsta52dec.c libgsta52dec_la_CFLAGS = $(GST_CFLAGS) -O3 $(ARCHFLAGS) $(FOMIT_FRAME_POINTER) -libgsta52dec_la_LIBADD = $(GST_LIBS) -la52 -lm +libgsta52dec_la_LIBADD = -la52 -lm libgsta52dec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) noinst_HEADERS = gsta52dec.h diff --git a/ext/dvdread/Makefile.am b/ext/dvdread/Makefile.am index c39296ad32..4a17d99939 100644 --- a/ext/dvdread/Makefile.am +++ b/ext/dvdread/Makefile.am @@ -7,7 +7,7 @@ plugin_LTLIBRARIES = libgstdvdsrc.la libgstdvdsrc_la_SOURCES = dvdsrc.c libgstdvdsrc_la_CFLAGS = $(GST_CFLAGS) -libgstdvdsrc_la_LIBADD = $(GST_LIBS) $(DVDREAD_LIBS) +libgstdvdsrc_la_LIBADD = $(DVDREAD_LIBS) libgstdvdsrc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) noinst_HEADERS = dvdsrc.h diff --git a/ext/dvdread/demo-play.c b/ext/dvdread/demo-play.c index ca3a902aef..7bb41f6b29 100644 --- a/ext/dvdread/demo-play.c +++ b/ext/dvdread/demo-play.c @@ -49,7 +49,7 @@ int main(int argc,char *argv[]) { gst_init(&argc,&argv); gnome_init("MPEG2 Video player","0.0.1",argc,argv); - // ***** construct the main pipeline ***** + /* ***** construct the main pipeline ***** */ pipeline = GST_PIPELINE(gst_pipeline_new("pipeline")); g_return_val_if_fail(pipeline != NULL, -1); @@ -61,7 +61,7 @@ int main(int argc,char *argv[]) { gtk_object_set(GTK_OBJECT(src),"angle",atoi(argv[4]),NULL); parse = gst_elementfactory_make("mpeg2parse","parse"); - //parse = gst_elementfactory_make("mpeg1parse","parse"); + /*parse = gst_elementfactory_make("mpeg1parse","parse"); */ g_return_val_if_fail(parse != NULL, -1); gst_bin_add(GST_BIN(pipeline),GST_ELEMENT(src)); @@ -70,7 +70,7 @@ int main(int argc,char *argv[]) { gst_element_connect(src,"src",parse,"sink"); - // ***** pre-construct the video thread ***** + /* ***** pre-construct the video thread ***** */ v_thread = GST_ELEMENT(gst_thread_new("v_thread")); g_return_val_if_fail(v_thread != NULL, -1); @@ -96,7 +96,7 @@ int main(int argc,char *argv[]) { gst_element_connect(color,"src",show,"sink"); - // ***** pre-construct the audio thread ***** + /* ***** pre-construct the audio thread ***** */ a_thread = GST_ELEMENT(gst_thread_new("a_thread")); g_return_val_if_fail(a_thread != NULL, -1); @@ -117,7 +117,7 @@ int main(int argc,char *argv[]) { gst_element_connect(a_decode,"src",osssink,"sink"); - // ***** construct the GUI ***** + /* ***** construct the GUI ***** */ appwindow = gnome_app_new("DVD Player","DVD Player"); gtk_socket = gtk_socket_new (); diff --git a/ext/dvdread/dvdsrc.c b/ext/dvdread/dvdsrc.c index 372c13d9a0..451ca2eb75 100644 --- a/ext/dvdread/dvdsrc.c +++ b/ext/dvdread/dvdsrc.c @@ -114,15 +114,15 @@ static void dvdsrc_init (DVDSrc *dvdsrc); static void dvdsrc_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec); static void dvdsrc_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec); -//static GstBuffer * dvdsrc_get (GstPad *pad); +/*static GstBuffer * dvdsrc_get (GstPad *pad); */ static void dvdsrc_loop (GstElement *element); -//static GstBuffer * dvdsrc_get_region (GstPad *pad,gulong offset,gulong size); +/*static GstBuffer * dvdsrc_get_region (GstPad *pad,gulong offset,gulong size); */ static GstElementStateReturn dvdsrc_change_state (GstElement *element); static GstElementClass *parent_class = NULL; -//static guint dvdsrc_signals[LAST_SIGNAL] = { 0 }; +/*static guint dvdsrc_signals[LAST_SIGNAL] = { 0 }; */ GType dvdsrc_get_type (void) @@ -193,7 +193,7 @@ dvdsrc_init (DVDSrc *dvdsrc) static void dvdsrc_destory (DVDSrc *dvdsrc) { - // FIXME + /* FIXME */ g_print("FIXME\n"); g_free(dvdsrc->priv); } @@ -213,7 +213,7 @@ dvdsrc_set_property (GObject *object, guint prop_id, const GValue *value, GParam switch (prop_id) { case ARG_LOCATION: /* the element must be stopped in order to do this */ - //g_return_if_fail(!GST_FLAG_IS_SET(src,GST_STATE_RUNNING)); + /*g_return_if_fail(!GST_FLAG_IS_SET(src,GST_STATE_RUNNING)); */ if (priv->location) g_free (priv->location); @@ -462,7 +462,7 @@ dvdsrc_loop (GstElement *element) int len; /* create the buffer */ - // FIXME: should eventually use a bufferpool for this + /* FIXME: should eventually use a bufferpool for this */ buf = gst_buffer_new (); g_return_if_fail (buf); @@ -490,7 +490,7 @@ dvdsrc_loop (GstElement *element) */ navRead_DSI( &dsi_pack, &(data[ DSI_START_BYTE ]) ); assert( priv->cur_pack == dsi_pack.dsi_gi.nv_pck_lbn ); - //navPrint_DSI(&dsi_pack); + /*navPrint_DSI(&dsi_pack); */ /** @@ -679,7 +679,7 @@ dvdsrc_get (GstPad *pad) g_return_val_if_fail (GST_FLAG_IS_SET (dvdsrc, DVDSRC_OPEN),NULL); /* create the buffer */ - // FIXME: should eventually use a bufferpool for this + /* FIXME: should eventually use a bufferpool for this */ buf = gst_buffer_new (); g_return_val_if_fail (buf, NULL); diff --git a/ext/dvdread/dvdsrc.h b/ext/dvdread/dvdsrc.h index 2eb9937aca..0ab2239f64 100644 --- a/ext/dvdread/dvdsrc.h +++ b/ext/dvdread/dvdsrc.h @@ -45,7 +45,7 @@ GstElementDetails dvdsrc_details; #define GST_IS_DVDSRC_CLASS(obj) \ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_DVDSRC)) -// NOTE: per-element flags start with 16 for now +/* NOTE: per-element flags start with 16 for now */ typedef enum { DVDSRC_OPEN = GST_ELEMENT_FLAG_LAST, diff --git a/ext/lame/Makefile.am b/ext/lame/Makefile.am index 535635ec6a..b9215a7759 100644 --- a/ext/lame/Makefile.am +++ b/ext/lame/Makefile.am @@ -4,7 +4,7 @@ plugin_LTLIBRARIES = libgstlame.la libgstlame_la_SOURCES = gstlame.c libgstlame_la_CFLAGS = $(GST_CFLAGS) -libgstlame_la_LIBADD = $(GST_LIBS) $(LAME_LIBS) +libgstlame_la_LIBADD = $(LAME_LIBS) libgstlame_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) noinst_HEADERS = gstlame.h diff --git a/ext/lame/gstlame.c b/ext/lame/gstlame.c index ae4be60135..6806bd6c35 100644 --- a/ext/lame/gstlame.c +++ b/ext/lame/gstlame.c @@ -177,7 +177,7 @@ enum { ARG_ATH_ONLY, ARG_ATH_SHORT, ARG_NO_ATH, - /* ARG_ATH_TYPE, // note: CVS has this, 3.87 doesn't */ + /* ARG_ATH_TYPE, /* note: CVS has this, 3.87 doesn't */ */ ARG_ATH_LOWER, ARG_CWLIMIT, ARG_ALLOW_DIFF_SHORT, @@ -235,7 +235,7 @@ gst_lame_class_init (GstLameClass *klass) g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_BITRATE, g_param_spec_int("bitrate","bitrate","bitrate", - G_MININT,G_MAXINT,128,G_PARAM_READWRITE)); // CHECKME + G_MININT,G_MAXINT,128,G_PARAM_READWRITE)); /* CHECKME */ g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_FREQUENCY, g_param_spec_int("frequency","frequency","frequency", 0,G_MAXINT, 44100 ,G_PARAM_READABLE)); @@ -244,93 +244,93 @@ gst_lame_class_init (GstLameClass *klass) 0, 2, 2 ,G_PARAM_READABLE)); g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_COMPRESSION_RATIO, g_param_spec_float("compression_ratio","compression_ratio","compression_ratio", - 0.0,200.0,11.0,G_PARAM_READWRITE)); // CHECKME + 0.0,200.0,11.0,G_PARAM_READWRITE)); /* CHECKME */ g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_QUALITY, g_param_spec_enum("quality","quality","quality", - GST_TYPE_LAME_QUALITY,5,G_PARAM_READWRITE)); // CHECKME! + GST_TYPE_LAME_QUALITY,5,G_PARAM_READWRITE)); /* CHECKME! */ g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_MODE, g_param_spec_enum("mode","mode","mode", - GST_TYPE_LAME_MODE,0,G_PARAM_READWRITE)); // CHECKME! + GST_TYPE_LAME_MODE,0,G_PARAM_READWRITE)); /* CHECKME! */ g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_FORCE_MS, g_param_spec_boolean("force_ms","force_ms","force_ms", - TRUE,G_PARAM_READWRITE)); // CHECKME + TRUE,G_PARAM_READWRITE)); /* CHECKME */ g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_FREE_FORMAT, g_param_spec_boolean("free_format","free_format","free_format", - TRUE,G_PARAM_READWRITE)); // CHECKME + TRUE,G_PARAM_READWRITE)); /* CHECKME */ g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_COPYRIGHT, g_param_spec_boolean("copyright","copyright","copyright", - TRUE,G_PARAM_READWRITE)); // CHECKME + TRUE,G_PARAM_READWRITE)); /* CHECKME */ g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_ORIGINAL, g_param_spec_boolean("original","original","original", - TRUE,G_PARAM_READWRITE)); // CHECKME + TRUE,G_PARAM_READWRITE)); /* CHECKME */ g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_ERROR_PROTECTION, g_param_spec_boolean("error_protection","error_protection","error_protection", - TRUE,G_PARAM_READWRITE)); // CHECKME + TRUE,G_PARAM_READWRITE)); /* CHECKME */ g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_PADDING_TYPE, g_param_spec_enum("padding_type","padding_type","padding_type", - GST_TYPE_LAME_PADDING,0,G_PARAM_READWRITE)); // CHECKME! + GST_TYPE_LAME_PADDING,0,G_PARAM_READWRITE)); /* CHECKME! */ g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_EXTENSION, g_param_spec_boolean("extension","extension","extension", - TRUE,G_PARAM_READWRITE)); // CHECKME + TRUE,G_PARAM_READWRITE)); /* CHECKME */ g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_STRICT_ISO, g_param_spec_boolean("strict_iso","strict_iso","strict_iso", - TRUE,G_PARAM_READWRITE)); // CHECKME + TRUE,G_PARAM_READWRITE)); /* CHECKME */ g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_DISABLE_RESERVOIR, g_param_spec_boolean("disable_reservoir","disable_reservoir","disable_reservoir", - TRUE,G_PARAM_READWRITE)); // CHECKME + TRUE,G_PARAM_READWRITE)); /* CHECKME */ g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_VBR, g_param_spec_boolean("vbr","vbr","vbr", - TRUE,G_PARAM_READWRITE)); // CHECKME + TRUE,G_PARAM_READWRITE)); /* CHECKME */ g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_VBR_MEAN_BITRATE, g_param_spec_int("vbr_mean_bitrate","vbr_mean_bitrate","vbr_mean_bitrate", - 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_VBR_MIN_BITRATE, g_param_spec_int("vbr_min_bitrate","vbr_min_bitrate","vbr_min_bitrate", - 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_VBR_MAX_BITRATE, g_param_spec_int("vbr_max_bitrate","vbr_max_bitrate","vbr_max_bitrate", - 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_VBR_HARD_MIN, g_param_spec_int("vbr_hard_min","vbr_hard_min","vbr_hard_min", - 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_LOWPASS_FREQ, g_param_spec_int("lowpass_freq","lowpass_freq","lowpass_freq", - 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_LOWPASS_WIDTH, g_param_spec_int("lowpass_width","lowpass_width","lowpass_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_HIGHPASS_FREQ, g_param_spec_int("highpass_freq","highpass_freq","highpass_freq", - 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_HIGHPASS_WIDTH, g_param_spec_int("highpass_width","highpass_width","highpass_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_ATH_ONLY, g_param_spec_boolean("ath_only","ath_only","ath_only", - TRUE,G_PARAM_READWRITE)); // CHECKME + TRUE,G_PARAM_READWRITE)); /* CHECKME */ g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_ATH_SHORT, g_param_spec_boolean("ath_short","ath_short","ath_short", - TRUE,G_PARAM_READWRITE)); // CHECKME + TRUE,G_PARAM_READWRITE)); /* CHECKME */ g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_NO_ATH, g_param_spec_boolean("no_ath","no_ath","no_ath", - TRUE,G_PARAM_READWRITE)); // CHECKME + TRUE,G_PARAM_READWRITE)); /* CHECKME */ /* gtk_object_add_arg_type ("GstLame::ath_type", G_TYPE_INT, GTK_ARG_READWRITE, ARG_ATH_TYPE); */ g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_ATH_LOWER, g_param_spec_int("ath_lower","ath_lower","ath_lower", - 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_CWLIMIT, g_param_spec_int("cwlimit","cwlimit","cwlimit", - 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_ALLOW_DIFF_SHORT, g_param_spec_boolean("allow_diff_short","allow_diff_short","allow_diff_short", - TRUE,G_PARAM_READWRITE)); // CHECKME + TRUE,G_PARAM_READWRITE)); /* CHECKME */ g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_NO_SHORT_BLOCKS, g_param_spec_boolean("no_short_blocks","no_short_blocks","no_short_blocks", - TRUE,G_PARAM_READWRITE)); // CHECKME + TRUE,G_PARAM_READWRITE)); /* CHECKME */ g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_EMPHASIS, g_param_spec_boolean("emphasis","emphasis","emphasis", - TRUE,G_PARAM_READWRITE)); // CHECKME + TRUE,G_PARAM_READWRITE)); /* CHECKME */ gobject_class->set_property = gst_lame_set_property; gobject_class->get_property = gst_lame_get_property; diff --git a/ext/mad/Makefile.am b/ext/mad/Makefile.am index 694f45f8bb..ace660aba0 100644 --- a/ext/mad/Makefile.am +++ b/ext/mad/Makefile.am @@ -4,6 +4,6 @@ plugin_LTLIBRARIES = libgstmad.la libgstmad_la_SOURCES = gstmad.c libgstmad_la_CFLAGS = $(GST_CFLAGS) -libgstmad_la_LIBADD = $(GST_LIBS) $(MAD_LIBS) +libgstmad_la_LIBADD = $(MAD_LIBS) libgstmad_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/ext/mpeg2dec/Makefile.am b/ext/mpeg2dec/Makefile.am index 55d5f329a4..d283793d57 100644 --- a/ext/mpeg2dec/Makefile.am +++ b/ext/mpeg2dec/Makefile.am @@ -10,13 +10,13 @@ endif libgstmpeg2dec_la_SOURCES = gstmpeg2dec.c libgstmpeg2dec_la_CFLAGS = $(GST_CFLAGS) $(MPEG2DEC_CFLAGS) $(ARCHFLAGS) $(FOMIT_FRAME_POINTER) -ffast-math -libgstmpeg2dec_la_LIBADD = $(GST_LIBS) $(MPEG2DEC_LIBS) +libgstmpeg2dec_la_LIBADD = $(MPEG2DEC_LIBS) libgstmpeg2dec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) # # Use the following if you use mpeg2dec from CVS # -#libgstmpeg2dec_la_LIBADD = $(GST_LIBS) -lmpeg2 -lcpuaccel +#libgstmpeg2dec_la_LIBADD = -lmpeg2 -lcpuaccel noinst_HEADERS = gstmpeg2dec.h diff --git a/ext/mpeg2dec/gstmpeg2dec.c b/ext/mpeg2dec/gstmpeg2dec.c index 4d1a39bc69..fb56e77fce 100644 --- a/ext/mpeg2dec/gstmpeg2dec.c +++ b/ext/mpeg2dec/gstmpeg2dec.c @@ -552,7 +552,7 @@ gst_mpeg2dec_change_state (GstElement *element) /* if we are not closed by an EOS event do so now, this cen send a few frames but * we are prepared to not really send them (see above) */ if (!mpeg2dec->closed) { - //mpeg2_close (mpeg2dec->decoder); + /*mpeg2_close (mpeg2dec->decoder); */ mpeg2dec->closed = TRUE; } gst_mpeg2dec_vo_destroy (mpeg2dec); diff --git a/ext/sidplay/Makefile.am b/ext/sidplay/Makefile.am index 0e873cbbcb..0981b445c5 100644 --- a/ext/sidplay/Makefile.am +++ b/ext/sidplay/Makefile.am @@ -4,7 +4,7 @@ plugin_LTLIBRARIES = libgstsid.la libgstsid_la_SOURCES = gstsiddec.cc libgstsid_la_CXXFLAGS = $(GST_CFLAGS) $(SIDPLAY_CFLAGS) -libgstsid_la_LIBADD = $(GST_LIBS) $(SIDPLAY_LIBS) +libgstsid_la_LIBADD = $(SIDPLAY_LIBS) libgstsid_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) noinst_HEADERS = gstsiddec.h diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am index 082ace35c7..b6e7b47dd3 100644 --- a/gst-libs/gst/audio/Makefile.am +++ b/gst-libs/gst/audio/Makefile.am @@ -7,6 +7,6 @@ libgstaudio_la_SOURCES = audio.c libgstaudioincludedir = $(includedir)/gst/audio libgstaudioinclude_HEADERS = audio.h -libgstaudio_la_LIBADD = $(GST_LIBS) +libgstaudio_la_LIBADD = libgstaudio_la_CFLAGS = $(GST_CFLAGS) -finline-functions -ffast-math libgstaudio_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/gst-libs/gst/audio/audio.c b/gst-libs/gst/audio/audio.c index 31b9ed89b2..1a0bcf2249 100644 --- a/gst-libs/gst/audio/audio.c +++ b/gst-libs/gst/audio/audio.c @@ -131,7 +131,7 @@ gst_audio_highest_sample_value (GstPad* pad) GstCaps *caps = NULL; caps = GST_PAD_CAPS (pad); - // FIXME : Please change this to a better warning method ! + /* FIXME : Please change this to a better warning method ! */ if (caps == NULL) printf ("WARNING: gstaudio: could not get caps of pad !\n"); width = gst_caps_get_int (caps, "width"); diff --git a/gst-libs/gst/idct/Makefile.am b/gst-libs/gst/idct/Makefile.am index 8fea312184..8b9d86ba02 100644 --- a/gst-libs/gst/idct/Makefile.am +++ b/gst-libs/gst/idct/Makefile.am @@ -27,6 +27,6 @@ ieeetest_LDFLAGS = $(GST_LIBS) noinst_HEADERS = dct.h -libgstidct_la_LIBADD = $(GST_LIBS) +libgstidct_la_LIBADD = libgstidct_la_CFLAGS = $(GST_CFLAGS) -finline-functions -ffast-math libgstidct_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/gst-libs/gst/idct/ieeetest.c b/gst-libs/gst/idct/ieeetest.c index 23d64eb5b1..5925a6fd74 100644 --- a/gst-libs/gst/idct/ieeetest.c +++ b/gst-libs/gst/idct/ieeetest.c @@ -117,7 +117,7 @@ main(int argc, char **argv) gst_trace_read_tsc(&tscstart); gst_idct_convert(idct, testout); gst_trace_read_tsc(&tscstop); - //printf("time %llu, %llu %lld\n", tscstart, tscstop, tscstop-tscstart); + /*printf("time %llu, %llu %lld\n", tscstart, tscstop, tscstop-tscstart); */ if (tscstop - tscstart < tscmin) tscmin = tscstop-tscstart; if (tscstop - tscstart > tscmax) tscmax = tscstop-tscstart; diff --git a/gst-libs/gst/idct/mmx32idct.c b/gst-libs/gst/idct/mmx32idct.c index 78bf45bf25..0090d8a723 100644 --- a/gst-libs/gst/idct/mmx32idct.c +++ b/gst-libs/gst/idct/mmx32idct.c @@ -22,148 +22,148 @@ */ -// MMX32 iDCT algorithm (IEEE-1180 compliant) :: idct_mmx32() -// -// MPEG2AVI -// -------- -// v0.16B33 initial release -// -// This was one of the harder pieces of work to code. -// Intel's app-note focuses on the numerical issues of the algorithm, but -// assumes the programmer is familiar with IDCT mathematics, leaving the -// form of the complete function up to the programmer's imagination. -// -// ALGORITHM OVERVIEW -// ------------------ -// I played around with the code for quite a few hours. I came up -// with *A* working IDCT algorithm, however I'm not sure whether my routine -// is "the correct one." But rest assured, my code passes all six IEEE -// accuracy tests with plenty of margin. -// -// My IDCT algorithm consists of 4 steps: -// -// 1) IDCT-row transformation (using the IDCT-row function) on all 8 rows -// This yields an intermediate 8x8 matrix. -// -// 2) intermediate matrix transpose (mandatory) -// -// 3) IDCT-row transformation (2nd time) on all 8 rows of the intermediate -// matrix. The output is the final-result, in transposed form. -// -// 4) post-transformation matrix transpose -// (not necessary if the input-data is already transposed, this could -// be done during the MPEG "zig-zag" scan, but since my algorithm -// requires at least one transpose operation, why not re-use the -// transpose-code.) -// -// Although the (1st) and (3rd) steps use the SAME row-transform operation, -// the (3rd) step uses different shift&round constants (explained later.) -// -// Also note that the intermediate transpose (2) would not be neccessary, -// if the subsequent operation were a iDCT-column transformation. Since -// we only have the iDCT-row transform, we transpose the intermediate -// matrix and use the iDCT-row transform a 2nd time. -// -// I had to change some constants/variables for my method to work : -// -// As given by Intel, the #defines for SHIFT_INV_COL and RND_INV_COL are -// wrong. Not surprising since I'm not using a true column-transform -// operation, but the row-transform operation (as mentioned earlier.) -// round_inv_col[], which is given as "4 short" values, should have the -// same dimensions as round_inv_row[]. The corrected variables are -// shown. -// -// Intel's code defines a different table for each each row operation. -// The tables given are 0/4, 1/7, 2/6, and 5/3. My code only uses row#0. -// Using the other rows messes up the overall transform. -// -// IMPLEMENTATION DETAILs -// ---------------------- -// -// I divided the algorithm's work into two subroutines, -// 1) idct_mmx32_rows() - transforms 8 rows, then transpose -// 2) idct_mmx32_cols() - transforms 8 rows, then transpose -// yields final result ("drop-in" direct replacement for INT32 IDCT) -// -// The 2nd function is a clone of the 1st, with changes made only to the -// shift&rounding instructions. -// -// In the 1st function (rows), the shift & round instructions use -// SHIFT_INV_ROW & round_inv_row[] (renamed to r_inv_row[]) -// -// In the 2nd function (cols)-> r_inv_col[], and -// SHIFT_INV_COL & round_inv_col[] (renamed to r_inv_col[]) -// -// Each function contains an integrated transpose-operator, which comes -// AFTER the primary transformation operation. In the future, I'll optimize -// the code to do more of the transpose-work "in-place". Right now, I've -// left the code as two subroutines and a main calling function, so other -// people can read the code more easily. -// -// liaor@umcc.ais.org http://members.tripod.com/~liaor -// +/* MMX32 iDCT algorithm (IEEE-1180 compliant) :: idct_mmx32() */ +/* */ +/* MPEG2AVI */ +/* -------- */ +/* v0.16B33 initial release */ +/* */ +/* This was one of the harder pieces of work to code. */ +/* Intel's app-note focuses on the numerical issues of the algorithm, but */ +/* assumes the programmer is familiar with IDCT mathematics, leaving the */ +/* form of the complete function up to the programmer's imagination. */ +/* */ +/* ALGORITHM OVERVIEW */ +/* ------------------ */ +/* I played around with the code for quite a few hours. I came up */ +/* with *A* working IDCT algorithm, however I'm not sure whether my routine */ +/* is "the correct one." But rest assured, my code passes all six IEEE */ +/* accuracy tests with plenty of margin. */ +/* */ +/* My IDCT algorithm consists of 4 steps: */ +/* */ +/* 1) IDCT-row transformation (using the IDCT-row function) on all 8 rows */ +/* This yields an intermediate 8x8 matrix. */ +/* */ +/* 2) intermediate matrix transpose (mandatory) */ +/* */ +/* 3) IDCT-row transformation (2nd time) on all 8 rows of the intermediate */ +/* matrix. The output is the final-result, in transposed form. */ +/* */ +/* 4) post-transformation matrix transpose */ +/* (not necessary if the input-data is already transposed, this could */ +/* be done during the MPEG "zig-zag" scan, but since my algorithm */ +/* requires at least one transpose operation, why not re-use the */ +/* transpose-code.) */ +/* */ +/* Although the (1st) and (3rd) steps use the SAME row-transform operation, */ +/* the (3rd) step uses different shift&round constants (explained later.) */ +/* */ +/* Also note that the intermediate transpose (2) would not be neccessary, */ +/* if the subsequent operation were a iDCT-column transformation. Since */ +/* we only have the iDCT-row transform, we transpose the intermediate */ +/* matrix and use the iDCT-row transform a 2nd time. */ +/* */ +/* I had to change some constants/variables for my method to work : */ +/* */ +/* As given by Intel, the #defines for SHIFT_INV_COL and RND_INV_COL are */ +/* wrong. Not surprising since I'm not using a true column-transform */ +/* operation, but the row-transform operation (as mentioned earlier.) */ +/* round_inv_col[], which is given as "4 short" values, should have the */ +/* same dimensions as round_inv_row[]. The corrected variables are */ +/* shown. */ +/* */ +/* Intel's code defines a different table for each each row operation. */ +/* The tables given are 0/4, 1/7, 2/6, and 5/3. My code only uses row#0. */ +/* Using the other rows messes up the overall transform. */ +/* */ +/* IMPLEMENTATION DETAILs */ +/* ---------------------- */ +/* */ +/* I divided the algorithm's work into two subroutines, */ +/* 1) idct_mmx32_rows() - transforms 8 rows, then transpose */ +/* 2) idct_mmx32_cols() - transforms 8 rows, then transpose */ +/* yields final result ("drop-in" direct replacement for INT32 IDCT) */ +/* */ +/* The 2nd function is a clone of the 1st, with changes made only to the */ +/* shift&rounding instructions. */ +/* */ +/* In the 1st function (rows), the shift & round instructions use */ +/* SHIFT_INV_ROW & round_inv_row[] (renamed to r_inv_row[]) */ +/* */ +/* In the 2nd function (cols)-> r_inv_col[], and */ +/* SHIFT_INV_COL & round_inv_col[] (renamed to r_inv_col[]) */ +/* */ +/* Each function contains an integrated transpose-operator, which comes */ +/* AFTER the primary transformation operation. In the future, I'll optimize */ +/* the code to do more of the transpose-work "in-place". Right now, I've */ +/* left the code as two subroutines and a main calling function, so other */ +/* people can read the code more easily. */ +/* */ +/* liaor@umcc.ais.org http://members.tripod.com/~liaor */ +/* */ -//;============================================================================= -//; -//; AP-922 http://developer.intel.com/vtune/cbts/strmsimd -//; These examples contain code fragments for first stage iDCT 8x8 -//; (for rows) and first stage DCT 8x8 (for columns) -//; -//;============================================================================= +/*;============================================================================= */ +/*; */ +/*; AP-922 http://developer.intel.com/vtune/cbts/strmsimd */ +/*; These examples contain code fragments for first stage iDCT 8x8 */ +/*; (for rows) and first stage DCT 8x8 (for columns) */ +/*; */ +/*;============================================================================= */ /* mword typedef qword qword ptr equ mword ptr */ #include -#define BITS_INV_ACC 4 //; 4 or 5 for IEEE - // 5 yields higher accuracy, but lessens dynamic range on the input matrix +#define BITS_INV_ACC 4 /*; 4 or 5 for IEEE */ + /* 5 yields higher accuracy, but lessens dynamic range on the input matrix */ #define SHIFT_INV_ROW (16 - BITS_INV_ACC) -#define SHIFT_INV_COL (1 + BITS_INV_ACC +14 ) // changed from Intel's val) -//#define SHIFT_INV_COL (1 + BITS_INV_ACC ) +#define SHIFT_INV_COL (1 + BITS_INV_ACC +14 ) /* changed from Intel's val) */ +/*#define SHIFT_INV_COL (1 + BITS_INV_ACC ) */ #define RND_INV_ROW (1 << (SHIFT_INV_ROW-1)) #define RND_INV_COL (1 << (SHIFT_INV_COL-1)) -#define RND_INV_CORR (RND_INV_COL - 1) //; correction -1.0 and round -//#define RND_INV_ROW (1024 * (6 - BITS_INV_ACC)) //; 1 << (SHIFT_INV_ROW-1) -//#define RND_INV_COL (16 * (BITS_INV_ACC - 3)) //; 1 << (SHIFT_INV_COL-1) +#define RND_INV_CORR (RND_INV_COL - 1) /*; correction -1.0 and round */ +/*#define RND_INV_ROW (1024 * (6 - BITS_INV_ACC)) //; 1 << (SHIFT_INV_ROW-1) */ +/*#define RND_INV_COL (16 * (BITS_INV_ACC - 3)) //; 1 << (SHIFT_INV_COL-1) */ -//.data -//Align 16 +/*.data */ +/*Align 16 */ const static long r_inv_row[2] = { RND_INV_ROW, RND_INV_ROW}; const static long r_inv_col[2] = {RND_INV_COL, RND_INV_COL}; const static long r_inv_corr[2] = {RND_INV_CORR, RND_INV_CORR }; -//const static short r_inv_col[4] = -// {RND_INV_COL, RND_INV_COL, RND_INV_COL, RND_INV_COL}; -//const static short r_inv_corr[4] = -// {RND_INV_CORR, RND_INV_CORR, RND_INV_CORR, RND_INV_CORR}; +/*const static short r_inv_col[4] = */ +/* {RND_INV_COL, RND_INV_COL, RND_INV_COL, RND_INV_COL}; */ +/*const static short r_inv_corr[4] = */ +/* {RND_INV_CORR, RND_INV_CORR, RND_INV_CORR, RND_INV_CORR}; */ /* constants for the forward DCT -//#define BITS_FRW_ACC 3 //; 2 or 3 for accuracy -//#define SHIFT_FRW_COL BITS_FRW_ACC -//#define SHIFT_FRW_ROW (BITS_FRW_ACC + 17) -//#define RND_FRW_ROW (262144 * (BITS_FRW_ACC - 1)) //; 1 << (SHIFT_FRW_ROW-1) +/*#define BITS_FRW_ACC 3 //; 2 or 3 for accuracy */ +/*#define SHIFT_FRW_COL BITS_FRW_ACC */ +/*#define SHIFT_FRW_ROW (BITS_FRW_ACC + 17) */ +/*#define RND_FRW_ROW (262144 * (BITS_FRW_ACC - 1)) //; 1 << (SHIFT_FRW_ROW-1) */ const static __int64 one_corr = 0x0001000100010001; const static long r_frw_row[2] = {RND_FRW_ROW, RND_FRW_ROW }; -//const static short tg_1_16[4] = {13036, 13036, 13036, 13036 }; //tg * (2<<16) + 0.5 -//const static short tg_2_16[4] = {27146, 27146, 27146, 27146 }; //tg * (2<<16) + 0.5 -//const static short tg_3_16[4] = {-21746, -21746, -21746, -21746 }; //tg * (2<<16) + 0.5 -//const static short cos_4_16[4] = {-19195, -19195, -19195, -19195 }; //cos * (2<<16) + 0.5 -//const static short ocos_4_16[4] = {23170, 23170, 23170, 23170 }; //cos * (2<<15) + 0.5 +/*const static short tg_1_16[4] = {13036, 13036, 13036, 13036 }; //tg * (2<<16) + 0.5 */ +/*const static short tg_2_16[4] = {27146, 27146, 27146, 27146 }; //tg * (2<<16) + 0.5 */ +/*const static short tg_3_16[4] = {-21746, -21746, -21746, -21746 }; //tg * (2<<16) + 0.5 */ +/*const static short cos_4_16[4] = {-19195, -19195, -19195, -19195 }; //cos * (2<<16) + 0.5 */ +/*const static short ocos_4_16[4] = {23170, 23170, 23170, 23170 }; //cos * (2<<15) + 0.5 */ -//concatenated table, for forward DCT transformation +/*concatenated table, for forward DCT transformation */ const static short tg_all_16[] = { - 13036, 13036, 13036, 13036, // tg * (2<<16) + 0.5 - 27146, 27146, 27146, 27146, //tg * (2<<16) + 0.5 - -21746, -21746, -21746, -21746, // tg * (2<<16) + 0.5 - -19195, -19195, -19195, -19195, //cos * (2<<16) + 0.5 - 23170, 23170, 23170, 23170 }; //cos * (2<<15) + 0.5 + 13036, 13036, 13036, 13036, /* tg * (2<<16) + 0.5 */ + 27146, 27146, 27146, 27146, /*tg * (2<<16) + 0.5 */ + -21746, -21746, -21746, -21746, /* tg * (2<<16) + 0.5 */ + -19195, -19195, -19195, -19195, /*cos * (2<<16) + 0.5 */ + 23170, 23170, 23170, 23170 }; /*cos * (2<<15) + 0.5 */ #define tg_1_16 (tg_all_16 + 0) #define tg_2_16 (tg_all_16 + 8) @@ -231,553 +231,553 @@ const static short tg_all_16[] = { IF _MMX ; MMX code ;============================================================================= -//; Table for rows 0,4 - constants are multiplied by cos_4_16 +/*; Table for rows 0,4 - constants are multiplied by cos_4_16 */ const short tab_i_04[] = { - 16384, 16384, 16384, -16384, // ; movq-> w06 w04 w02 w00 - 21407, 8867, 8867, -21407, // w07 w05 w03 w01 - 16384, -16384, 16384, 16384, //; w14 w12 w10 w08 - -8867, 21407, -21407, -8867, //; w15 w13 w11 w09 - 22725, 12873, 19266, -22725, //; w22 w20 w18 w16 - 19266, 4520, -4520, -12873, //; w23 w21 w19 w17 - 12873, 4520, 4520, 19266, //; w30 w28 w26 w24 - -22725, 19266, -12873, -22725 };//w31 w29 w27 w25 + 16384, 16384, 16384, -16384, /* ; movq-> w06 w04 w02 w00 */ + 21407, 8867, 8867, -21407, /* w07 w05 w03 w01 */ + 16384, -16384, 16384, 16384, /*; w14 w12 w10 w08 */ + -8867, 21407, -21407, -8867, /*; w15 w13 w11 w09 */ + 22725, 12873, 19266, -22725, /*; w22 w20 w18 w16 */ + 19266, 4520, -4520, -12873, /*; w23 w21 w19 w17 */ + 12873, 4520, 4520, 19266, /*; w30 w28 w26 w24 */ + -22725, 19266, -12873, -22725 };/*w31 w29 w27 w25 */ -//; Table for rows 1,7 - constants are multiplied by cos_1_16 +/*; Table for rows 1,7 - constants are multiplied by cos_1_16 */ const short tab_i_17[] = { - 22725, 22725, 22725, -22725, // ; movq-> w06 w04 w02 w00 - 29692, 12299, 12299, -29692, // ; w07 w05 w03 w01 - 22725, -22725, 22725, 22725, //; w14 w12 w10 w08 - -12299, 29692, -29692, -12299, //; w15 w13 w11 w09 - 31521, 17855, 26722, -31521, //; w22 w20 w18 w16 - 26722, 6270, -6270, -17855, //; w23 w21 w19 w17 - 17855, 6270, 6270, 26722, //; w30 w28 w26 w24 - -31521, 26722, -17855, -31521}; // w31 w29 w27 w25 + 22725, 22725, 22725, -22725, /* ; movq-> w06 w04 w02 w00 */ + 29692, 12299, 12299, -29692, /* ; w07 w05 w03 w01 */ + 22725, -22725, 22725, 22725, /*; w14 w12 w10 w08 */ + -12299, 29692, -29692, -12299, /*; w15 w13 w11 w09 */ + 31521, 17855, 26722, -31521, /*; w22 w20 w18 w16 */ + 26722, 6270, -6270, -17855, /*; w23 w21 w19 w17 */ + 17855, 6270, 6270, 26722, /*; w30 w28 w26 w24 */ + -31521, 26722, -17855, -31521}; /* w31 w29 w27 w25 */ -//; Table for rows 2,6 - constants are multiplied by cos_2_16 +/*; Table for rows 2,6 - constants are multiplied by cos_2_16 */ const short tab_i_26[] = { - 21407, 21407, 21407, -21407, // ; movq-> w06 w04 w02 w00 - 27969, 11585, 11585, -27969, // ; w07 w05 w03 w01 - 21407, -21407, 21407, 21407, // ; w14 w12 w10 w08 - -11585, 27969, -27969, -11585, // ;w15 w13 w11 w09 - 29692, 16819, 25172, -29692, // ;w22 w20 w18 w16 - 25172, 5906, -5906, -16819, // ;w23 w21 w19 w17 - 16819, 5906, 5906, 25172, // ;w30 w28 w26 w24 - -29692, 25172, -16819, -29692}; // ;w31 w29 w27 w25 + 21407, 21407, 21407, -21407, /* ; movq-> w06 w04 w02 w00 */ + 27969, 11585, 11585, -27969, /* ; w07 w05 w03 w01 */ + 21407, -21407, 21407, 21407, /* ; w14 w12 w10 w08 */ + -11585, 27969, -27969, -11585, /* ;w15 w13 w11 w09 */ + 29692, 16819, 25172, -29692, /* ;w22 w20 w18 w16 */ + 25172, 5906, -5906, -16819, /* ;w23 w21 w19 w17 */ + 16819, 5906, 5906, 25172, /* ;w30 w28 w26 w24 */ + -29692, 25172, -16819, -29692}; /* ;w31 w29 w27 w25 */ -//; Table for rows 3,5 - constants are multiplied by cos_3_16 +/*; Table for rows 3,5 - constants are multiplied by cos_3_16 */ const short tab_i_35[] = { - 19266, 19266, 19266, -19266, //; movq-> w06 w04 w02 w00 - 25172, 10426, 10426, -25172, //; w07 w05 w03 w01 - 19266, -19266, 19266, 19266, //; w14 w12 w10 w08 - -10426, 25172, -25172, -10426, //; w15 w13 w11 w09 - 26722, 15137, 22654, -26722, //; w22 w20 w18 w16 - 22654, 5315, -5315, -15137, //; w23 w21 w19 w17 - 15137, 5315, 5315, 22654, //; w30 w28 w26 w24 - -26722, 22654, -15137, -26722}; //; w31 w29 w27 w25 + 19266, 19266, 19266, -19266, /*; movq-> w06 w04 w02 w00 */ + 25172, 10426, 10426, -25172, /*; w07 w05 w03 w01 */ + 19266, -19266, 19266, 19266, /*; w14 w12 w10 w08 */ + -10426, 25172, -25172, -10426, /*; w15 w13 w11 w09 */ + 26722, 15137, 22654, -26722, /*; w22 w20 w18 w16 */ + 22654, 5315, -5315, -15137, /*; w23 w21 w19 w17 */ + 15137, 5315, 5315, 22654, /*; w30 w28 w26 w24 */ + -26722, 22654, -15137, -26722}; /*; w31 w29 w27 w25 */ */ -// CONCATENATED TABLE, rows 0,1,2,3,4,5,6,7 (in order ) -// -// In our implementation, however, we only use row0 ! -// +/* CONCATENATED TABLE, rows 0,1,2,3,4,5,6,7 (in order ) */ +/* */ +/* In our implementation, however, we only use row0 ! */ +/* */ static const short tab_i_01234567[] = { - //row0, this row is required - 16384, 16384, 16384, -16384, // ; movq-> w06 w04 w02 w00 - 21407, 8867, 8867, -21407, // w07 w05 w03 w01 - 16384, -16384, 16384, 16384, //; w14 w12 w10 w08 - -8867, 21407, -21407, -8867, //; w15 w13 w11 w09 - 22725, 12873, 19266, -22725, //; w22 w20 w18 w16 - 19266, 4520, -4520, -12873, //; w23 w21 w19 w17 - 12873, 4520, 4520, 19266, //; w30 w28 w26 w24 - -22725, 19266, -12873, -22725, //w31 w29 w27 w25 + /*row0, this row is required */ + 16384, 16384, 16384, -16384, /* ; movq-> w06 w04 w02 w00 */ + 21407, 8867, 8867, -21407, /* w07 w05 w03 w01 */ + 16384, -16384, 16384, 16384, /*; w14 w12 w10 w08 */ + -8867, 21407, -21407, -8867, /*; w15 w13 w11 w09 */ + 22725, 12873, 19266, -22725, /*; w22 w20 w18 w16 */ + 19266, 4520, -4520, -12873, /*; w23 w21 w19 w17 */ + 12873, 4520, 4520, 19266, /*; w30 w28 w26 w24 */ + -22725, 19266, -12873, -22725, /*w31 w29 w27 w25 */ - // the rest of these rows (1-7), aren't used ! + /* the rest of these rows (1-7), aren't used ! */ - //row1 - 22725, 22725, 22725, -22725, // ; movq-> w06 w04 w02 w00 - 29692, 12299, 12299, -29692, // ; w07 w05 w03 w01 - 22725, -22725, 22725, 22725, //; w14 w12 w10 w08 - -12299, 29692, -29692, -12299, //; w15 w13 w11 w09 - 31521, 17855, 26722, -31521, //; w22 w20 w18 w16 - 26722, 6270, -6270, -17855, //; w23 w21 w19 w17 - 17855, 6270, 6270, 26722, //; w30 w28 w26 w24 - -31521, 26722, -17855, -31521, // w31 w29 w27 w25 + /*row1 */ + 22725, 22725, 22725, -22725, /* ; movq-> w06 w04 w02 w00 */ + 29692, 12299, 12299, -29692, /* ; w07 w05 w03 w01 */ + 22725, -22725, 22725, 22725, /*; w14 w12 w10 w08 */ + -12299, 29692, -29692, -12299, /*; w15 w13 w11 w09 */ + 31521, 17855, 26722, -31521, /*; w22 w20 w18 w16 */ + 26722, 6270, -6270, -17855, /*; w23 w21 w19 w17 */ + 17855, 6270, 6270, 26722, /*; w30 w28 w26 w24 */ + -31521, 26722, -17855, -31521, /* w31 w29 w27 w25 */ - //row2 - 21407, 21407, 21407, -21407, // ; movq-> w06 w04 w02 w00 - 27969, 11585, 11585, -27969, // ; w07 w05 w03 w01 - 21407, -21407, 21407, 21407, // ; w14 w12 w10 w08 - -11585, 27969, -27969, -11585, // ;w15 w13 w11 w09 - 29692, 16819, 25172, -29692, // ;w22 w20 w18 w16 - 25172, 5906, -5906, -16819, // ;w23 w21 w19 w17 - 16819, 5906, 5906, 25172, // ;w30 w28 w26 w24 - -29692, 25172, -16819, -29692, // ;w31 w29 w27 w25 + /*row2 */ + 21407, 21407, 21407, -21407, /* ; movq-> w06 w04 w02 w00 */ + 27969, 11585, 11585, -27969, /* ; w07 w05 w03 w01 */ + 21407, -21407, 21407, 21407, /* ; w14 w12 w10 w08 */ + -11585, 27969, -27969, -11585, /* ;w15 w13 w11 w09 */ + 29692, 16819, 25172, -29692, /* ;w22 w20 w18 w16 */ + 25172, 5906, -5906, -16819, /* ;w23 w21 w19 w17 */ + 16819, 5906, 5906, 25172, /* ;w30 w28 w26 w24 */ + -29692, 25172, -16819, -29692, /* ;w31 w29 w27 w25 */ - //row3 - 19266, 19266, 19266, -19266, //; movq-> w06 w04 w02 w00 - 25172, 10426, 10426, -25172, //; w07 w05 w03 w01 - 19266, -19266, 19266, 19266, //; w14 w12 w10 w08 - -10426, 25172, -25172, -10426, //; w15 w13 w11 w09 - 26722, 15137, 22654, -26722, //; w22 w20 w18 w16 - 22654, 5315, -5315, -15137, //; w23 w21 w19 w17 - 15137, 5315, 5315, 22654, //; w30 w28 w26 w24 - -26722, 22654, -15137, -26722, //; w31 w29 w27 w25 + /*row3 */ + 19266, 19266, 19266, -19266, /*; movq-> w06 w04 w02 w00 */ + 25172, 10426, 10426, -25172, /*; w07 w05 w03 w01 */ + 19266, -19266, 19266, 19266, /*; w14 w12 w10 w08 */ + -10426, 25172, -25172, -10426, /*; w15 w13 w11 w09 */ + 26722, 15137, 22654, -26722, /*; w22 w20 w18 w16 */ + 22654, 5315, -5315, -15137, /*; w23 w21 w19 w17 */ + 15137, 5315, 5315, 22654, /*; w30 w28 w26 w24 */ + -26722, 22654, -15137, -26722, /*; w31 w29 w27 w25 */ - //row4 - 16384, 16384, 16384, -16384, // ; movq-> w06 w04 w02 w00 - 21407, 8867, 8867, -21407, // w07 w05 w03 w01 - 16384, -16384, 16384, 16384, //; w14 w12 w10 w08 - -8867, 21407, -21407, -8867, //; w15 w13 w11 w09 - 22725, 12873, 19266, -22725, //; w22 w20 w18 w16 - 19266, 4520, -4520, -12873, //; w23 w21 w19 w17 - 12873, 4520, 4520, 19266, //; w30 w28 w26 w24 - -22725, 19266, -12873, -22725, //w31 w29 w27 w25 + /*row4 */ + 16384, 16384, 16384, -16384, /* ; movq-> w06 w04 w02 w00 */ + 21407, 8867, 8867, -21407, /* w07 w05 w03 w01 */ + 16384, -16384, 16384, 16384, /*; w14 w12 w10 w08 */ + -8867, 21407, -21407, -8867, /*; w15 w13 w11 w09 */ + 22725, 12873, 19266, -22725, /*; w22 w20 w18 w16 */ + 19266, 4520, -4520, -12873, /*; w23 w21 w19 w17 */ + 12873, 4520, 4520, 19266, /*; w30 w28 w26 w24 */ + -22725, 19266, -12873, -22725, /*w31 w29 w27 w25 */ - //row5 - 19266, 19266, 19266, -19266, //; movq-> w06 w04 w02 w00 - 25172, 10426, 10426, -25172, //; w07 w05 w03 w01 - 19266, -19266, 19266, 19266, //; w14 w12 w10 w08 - -10426, 25172, -25172, -10426, //; w15 w13 w11 w09 - 26722, 15137, 22654, -26722, //; w22 w20 w18 w16 - 22654, 5315, -5315, -15137, //; w23 w21 w19 w17 - 15137, 5315, 5315, 22654, //; w30 w28 w26 w24 - -26722, 22654, -15137, -26722, //; w31 w29 w27 w25 + /*row5 */ + 19266, 19266, 19266, -19266, /*; movq-> w06 w04 w02 w00 */ + 25172, 10426, 10426, -25172, /*; w07 w05 w03 w01 */ + 19266, -19266, 19266, 19266, /*; w14 w12 w10 w08 */ + -10426, 25172, -25172, -10426, /*; w15 w13 w11 w09 */ + 26722, 15137, 22654, -26722, /*; w22 w20 w18 w16 */ + 22654, 5315, -5315, -15137, /*; w23 w21 w19 w17 */ + 15137, 5315, 5315, 22654, /*; w30 w28 w26 w24 */ + -26722, 22654, -15137, -26722, /*; w31 w29 w27 w25 */ - //row6 - 21407, 21407, 21407, -21407, // ; movq-> w06 w04 w02 w00 - 27969, 11585, 11585, -27969, // ; w07 w05 w03 w01 - 21407, -21407, 21407, 21407, // ; w14 w12 w10 w08 - -11585, 27969, -27969, -11585, // ;w15 w13 w11 w09 - 29692, 16819, 25172, -29692, // ;w22 w20 w18 w16 - 25172, 5906, -5906, -16819, // ;w23 w21 w19 w17 - 16819, 5906, 5906, 25172, // ;w30 w28 w26 w24 - -29692, 25172, -16819, -29692, // ;w31 w29 w27 w25 + /*row6 */ + 21407, 21407, 21407, -21407, /* ; movq-> w06 w04 w02 w00 */ + 27969, 11585, 11585, -27969, /* ; w07 w05 w03 w01 */ + 21407, -21407, 21407, 21407, /* ; w14 w12 w10 w08 */ + -11585, 27969, -27969, -11585, /* ;w15 w13 w11 w09 */ + 29692, 16819, 25172, -29692, /* ;w22 w20 w18 w16 */ + 25172, 5906, -5906, -16819, /* ;w23 w21 w19 w17 */ + 16819, 5906, 5906, 25172, /* ;w30 w28 w26 w24 */ + -29692, 25172, -16819, -29692, /* ;w31 w29 w27 w25 */ - //row7 - 22725, 22725, 22725, -22725, // ; movq-> w06 w04 w02 w00 - 29692, 12299, 12299, -29692, // ; w07 w05 w03 w01 - 22725, -22725, 22725, 22725, //; w14 w12 w10 w08 - -12299, 29692, -29692, -12299, //; w15 w13 w11 w09 - 31521, 17855, 26722, -31521, //; w22 w20 w18 w16 - 26722, 6270, -6270, -17855, //; w23 w21 w19 w17 - 17855, 6270, 6270, 26722, //; w30 w28 w26 w24 - -31521, 26722, -17855, -31521}; // w31 w29 w27 w25 + /*row7 */ + 22725, 22725, 22725, -22725, /* ; movq-> w06 w04 w02 w00 */ + 29692, 12299, 12299, -29692, /* ; w07 w05 w03 w01 */ + 22725, -22725, 22725, 22725, /*; w14 w12 w10 w08 */ + -12299, 29692, -29692, -12299, /*; w15 w13 w11 w09 */ + 31521, 17855, 26722, -31521, /*; w22 w20 w18 w16 */ + 26722, 6270, -6270, -17855, /*; w23 w21 w19 w17 */ + 17855, 6270, 6270, 26722, /*; w30 w28 w26 w24 */ + -31521, 26722, -17855, -31521}; /* w31 w29 w27 w25 */ -#define INP eax // pointer to (short *blk) -#define OUT ecx // pointer to output (temporary store space qwTemp[]) -#define TABLE ebx // pointer to tab_i_01234567[] +#define INP eax /* pointer to (short *blk) */ +#define OUT ecx /* pointer to output (temporary store space qwTemp[]) */ +#define TABLE ebx /* pointer to tab_i_01234567[] */ #define round_inv_row edx #define round_inv_col edx -#define ROW_STRIDE 8 // for 8x8 matrix transposer +#define ROW_STRIDE 8 /* for 8x8 matrix transposer */ -// private variables and functions +/* private variables and functions */ -//temporary storage space, 8x8 of shorts +/*temporary storage space, 8x8 of shorts */ -__inline static void idct_mmx32_rows( short *blk ); // transform rows -__inline static void idct_mmx32_cols( short *blk ); // transform "columns" - // the "column" transform actually transforms rows, it is - // identical to the row-transform except for the ROUNDING - // and SHIFTING coefficients. +__inline static void idct_mmx32_rows( short *blk ); /* transform rows */ +__inline static void idct_mmx32_cols( short *blk ); /* transform "columns" */ + /* the "column" transform actually transforms rows, it is */ + /* identical to the row-transform except for the ROUNDING */ + /* and SHIFTING coefficients. */ static void -idct_mmx32_rows( short *blk ) // transform all 8 rows of 8x8 iDCT block +idct_mmx32_rows( short *blk ) /* transform all 8 rows of 8x8 iDCT block */ { int x; short qwTemp[64]; short *out = &qwTemp[0]; short *inptr = blk; - // this subroutine performs two operations - // 1) iDCT row transform - // for( i = 0; i < 8; ++ i) - // DCT_8_INV_ROW_1( blk[i*8], qwTemp[i] ); - // - // 2) transpose the matrix (which was stored in qwTemp[]) - // qwTemp[] -> [8x8 matrix transpose] -> blk[] + /* this subroutine performs two operations */ + /* 1) iDCT row transform */ + /* for( i = 0; i < 8; ++ i) */ + /* DCT_8_INV_ROW_1( blk[i*8], qwTemp[i] ); */ + /* */ + /* 2) transpose the matrix (which was stored in qwTemp[]) */ + /* qwTemp[] -> [8x8 matrix transpose] -> blk[] */ - for (x=0; x<8; x++) { // transform one row per iteration - movq_m2r(*(inptr), mm0); // 0 ; x3 x2 x1 x0 + for (x=0; x<8; x++) { /* transform one row per iteration */ + movq_m2r(*(inptr), mm0); /* 0 ; x3 x2 x1 x0 */ - movq_m2r(*(inptr+4), mm1); // 1 ; x7 x6 x5 x4 - movq_r2r(mm0, mm2); // 2 ; x3 x2 x1 x0 + movq_m2r(*(inptr+4), mm1); /* 1 ; x7 x6 x5 x4 */ + movq_r2r(mm0, mm2); /* 2 ; x3 x2 x1 x0 */ - movq_m2r(*(tab_i_01234567), mm3); // 3 ; w06 w04 w02 w00 - punpcklwd_r2r(mm1, mm0); // x5 x1 x4 x0 + movq_m2r(*(tab_i_01234567), mm3); /* 3 ; w06 w04 w02 w00 */ + punpcklwd_r2r(mm1, mm0); /* x5 x1 x4 x0 */ - // ---------- - movq_r2r(mm0, mm5); // 5 ; x5 x1 x4 x0 - punpckldq_r2r(mm0, mm0); // x4 x0 x4 x0 + /* ---------- */ + movq_r2r(mm0, mm5); /* 5 ; x5 x1 x4 x0 */ + punpckldq_r2r(mm0, mm0); /* x4 x0 x4 x0 */ - movq_m2r(*(tab_i_01234567+4), mm4); // 4 ; w07 w05 w03 w01 - punpckhwd_r2r(mm1, mm2); // 1 ; x7 x3 x6 x2 + movq_m2r(*(tab_i_01234567+4), mm4); /* 4 ; w07 w05 w03 w01 */ + punpckhwd_r2r(mm1, mm2); /* 1 ; x7 x3 x6 x2 */ - pmaddwd_r2r(mm0, mm3); // x4*w06+x0*w04 x4*w02+x0*w00 - movq_r2r(mm2, mm6); // 6 ; x7 x3 x6 x2 + pmaddwd_r2r(mm0, mm3); /* x4*w06+x0*w04 x4*w02+x0*w00 */ + movq_r2r(mm2, mm6); /* 6 ; x7 x3 x6 x2 */ - movq_m2r(*(tab_i_01234567+16), mm1);// 1 ; w22 w20 w18 w16 - punpckldq_r2r(mm2, mm2); // x6 x2 x6 x2 + movq_m2r(*(tab_i_01234567+16), mm1);/* 1 ; w22 w20 w18 w16 */ + punpckldq_r2r(mm2, mm2); /* x6 x2 x6 x2 */ - pmaddwd_r2r(mm2, mm4); // x6*w07+x2*w05 x6*w03+x2*w01 - punpckhdq_r2r(mm5, mm5); // x5 x1 x5 x1 + pmaddwd_r2r(mm2, mm4); /* x6*w07+x2*w05 x6*w03+x2*w01 */ + punpckhdq_r2r(mm5, mm5); /* x5 x1 x5 x1 */ - pmaddwd_m2r(*(tab_i_01234567+8), mm0);// x4*w14+x0*w12 x4*w10+x0*w08 - punpckhdq_r2r(mm6, mm6); // x7 x3 x7 x3 + pmaddwd_m2r(*(tab_i_01234567+8), mm0);/* x4*w14+x0*w12 x4*w10+x0*w08 */ + punpckhdq_r2r(mm6, mm6); /* x7 x3 x7 x3 */ - movq_m2r(*(tab_i_01234567+20), mm7);// 7 ; w23 w21 w19 w17 - pmaddwd_r2r(mm5, mm1); // x5*w22+x1*w20 x5*w18+x1*w16 + movq_m2r(*(tab_i_01234567+20), mm7);/* 7 ; w23 w21 w19 w17 */ + pmaddwd_r2r(mm5, mm1); /* x5*w22+x1*w20 x5*w18+x1*w16 */ - paddd_m2r(*(r_inv_row), mm3);// +rounder - pmaddwd_r2r(mm6, mm7); // x7*w23+x3*w21 x7*w19+x3*w17 + paddd_m2r(*(r_inv_row), mm3);/* +rounder */ + pmaddwd_r2r(mm6, mm7); /* x7*w23+x3*w21 x7*w19+x3*w17 */ - pmaddwd_m2r(*(tab_i_01234567+12), mm2);// x6*w15+x2*w13 x6*w11+x2*w09 - paddd_r2r(mm4, mm3); // 4 ; a1=sum(even1) a0=sum(even0) + pmaddwd_m2r(*(tab_i_01234567+12), mm2);/* x6*w15+x2*w13 x6*w11+x2*w09 */ + paddd_r2r(mm4, mm3); /* 4 ; a1=sum(even1) a0=sum(even0) */ - pmaddwd_m2r(*(tab_i_01234567+24), mm5);// x5*w30+x1*w28 x5*w26+x1*w24 - movq_r2r(mm3, mm4); // 4 ; a1 a0 + pmaddwd_m2r(*(tab_i_01234567+24), mm5);/* x5*w30+x1*w28 x5*w26+x1*w24 */ + movq_r2r(mm3, mm4); /* 4 ; a1 a0 */ - pmaddwd_m2r(*(tab_i_01234567+28), mm6);// x7*w31+x3*w29 x7*w27+x3*w25 - paddd_r2r(mm7, mm1); // 7 ; b1=sum(odd1) b0=sum(odd0) + pmaddwd_m2r(*(tab_i_01234567+28), mm6);/* x7*w31+x3*w29 x7*w27+x3*w25 */ + paddd_r2r(mm7, mm1); /* 7 ; b1=sum(odd1) b0=sum(odd0) */ - paddd_m2r(*(r_inv_row), mm0);// +rounder - psubd_r2r(mm1, mm3); // a1-b1 a0-b0 + paddd_m2r(*(r_inv_row), mm0);/* +rounder */ + psubd_r2r(mm1, mm3); /* a1-b1 a0-b0 */ - psrad_i2r(SHIFT_INV_ROW, mm3); // y6=a1-b1 y7=a0-b0 - paddd_r2r(mm4, mm1); // 4 ; a1+b1 a0+b0 + psrad_i2r(SHIFT_INV_ROW, mm3); /* y6=a1-b1 y7=a0-b0 */ + paddd_r2r(mm4, mm1); /* 4 ; a1+b1 a0+b0 */ - paddd_r2r(mm2, mm0); // 2 ; a3=sum(even3) a2=sum(even2) - psrad_i2r(SHIFT_INV_ROW, mm1); // y1=a1+b1 y0=a0+b0 + paddd_r2r(mm2, mm0); /* 2 ; a3=sum(even3) a2=sum(even2) */ + psrad_i2r(SHIFT_INV_ROW, mm1); /* y1=a1+b1 y0=a0+b0 */ - paddd_r2r(mm6, mm5); // 6 ; b3=sum(odd3) b2=sum(odd2) - movq_r2r(mm0, mm4); // 4 ; a3 a2 + paddd_r2r(mm6, mm5); /* 6 ; b3=sum(odd3) b2=sum(odd2) */ + movq_r2r(mm0, mm4); /* 4 ; a3 a2 */ - paddd_r2r(mm5, mm0); // a3+b3 a2+b2 - psubd_r2r(mm5, mm4); // 5 ; a3-b3 a2-b2 + paddd_r2r(mm5, mm0); /* a3+b3 a2+b2 */ + psubd_r2r(mm5, mm4); /* 5 ; a3-b3 a2-b2 */ - psrad_i2r(SHIFT_INV_ROW, mm4); // y4=a3-b3 y5=a2-b2 - psrad_i2r(SHIFT_INV_ROW, mm0); // y3=a3+b3 y2=a2+b2 + psrad_i2r(SHIFT_INV_ROW, mm4); /* y4=a3-b3 y5=a2-b2 */ + psrad_i2r(SHIFT_INV_ROW, mm0); /* y3=a3+b3 y2=a2+b2 */ - packssdw_r2r(mm3, mm4); // 3 ; y6 y7 y4 y5 + packssdw_r2r(mm3, mm4); /* 3 ; y6 y7 y4 y5 */ - packssdw_r2r(mm0, mm1); // 0 ; y3 y2 y1 y0 - movq_r2r(mm4, mm7); // 7 ; y6 y7 y4 y5 + packssdw_r2r(mm0, mm1); /* 0 ; y3 y2 y1 y0 */ + movq_r2r(mm4, mm7); /* 7 ; y6 y7 y4 y5 */ - psrld_i2r(16, mm4); // 0 y6 0 y4 + psrld_i2r(16, mm4); /* 0 y6 0 y4 */ - movq_r2m(mm1, *(out)); // 1 ; save y3 y2 y1 y0 - pslld_i2r(16, mm7); // y7 0 y5 0 + movq_r2m(mm1, *(out)); /* 1 ; save y3 y2 y1 y0 */ + pslld_i2r(16, mm7); /* y7 0 y5 0 */ - por_r2r(mm4, mm7); // 4 ; y7 y6 y5 y4 + por_r2r(mm4, mm7); /* 4 ; y7 y6 y5 y4 */ - // begin processing row 1 - movq_r2m(mm7, *(out+4)); // 7 ; save y7 y6 y5 y4 + /* begin processing row 1 */ + movq_r2m(mm7, *(out+4)); /* 7 ; save y7 y6 y5 y4 */ inptr += 8; out += 8; } - // done with the iDCT row-transformation + /* done with the iDCT row-transformation */ - // now we have to transpose the output 8x8 matrix - // 8x8 (OUT) -> 8x8't' (IN) - // the transposition is implemented as 4 sub-operations. - // 1) transpose upper-left quad - // 2) transpose lower-right quad - // 3) transpose lower-left quad - // 4) transpose upper-right quad + /* now we have to transpose the output 8x8 matrix */ + /* 8x8 (OUT) -> 8x8't' (IN) */ + /* the transposition is implemented as 4 sub-operations. */ + /* 1) transpose upper-left quad */ + /* 2) transpose lower-right quad */ + /* 3) transpose lower-left quad */ + /* 4) transpose upper-right quad */ - // mm0 = 1st row [ A B C D ] row1 - // mm1 = 2nd row [ E F G H ] 2 - // mm2 = 3rd row [ I J K L ] 3 - // mm3 = 4th row [ M N O P ] 4 + /* mm0 = 1st row [ A B C D ] row1 */ + /* mm1 = 2nd row [ E F G H ] 2 */ + /* mm2 = 3rd row [ I J K L ] 3 */ + /* mm3 = 4th row [ M N O P ] 4 */ - // 1) transpose upper-left quad + /* 1) transpose upper-left quad */ out = &qwTemp[0]; movq_m2r(*(out + ROW_STRIDE * 0), mm0); movq_m2r(*(out + ROW_STRIDE * 1), mm1); - movq_r2r(mm0, mm4); // mm4 = copy of row1[A B C D] + movq_r2r(mm0, mm4); /* mm4 = copy of row1[A B C D] */ movq_m2r(*(out + ROW_STRIDE * 2), mm2); - punpcklwd_r2r(mm1, mm0); // mm0 = [ 0 4 1 5] + punpcklwd_r2r(mm1, mm0); /* mm0 = [ 0 4 1 5] */ movq_m2r(*(out + ROW_STRIDE * 3), mm3); - punpckhwd_r2r(mm1, mm4); // mm4 = [ 2 6 3 7] + punpckhwd_r2r(mm1, mm4); /* mm4 = [ 2 6 3 7] */ movq_r2r(mm2, mm6); - punpcklwd_r2r(mm3, mm2); // mm2 = [ 8 12 9 13] + punpcklwd_r2r(mm3, mm2); /* mm2 = [ 8 12 9 13] */ - punpckhwd_r2r(mm3, mm6); // mm6 = 10 14 11 15] - movq_r2r(mm0, mm1); // mm1 = [ 0 4 1 5] + punpckhwd_r2r(mm3, mm6); /* mm6 = 10 14 11 15] */ + movq_r2r(mm0, mm1); /* mm1 = [ 0 4 1 5] */ inptr = blk; - punpckldq_r2r(mm2, mm0); // final result mm0 = row1 [0 4 8 12] + punpckldq_r2r(mm2, mm0); /* final result mm0 = row1 [0 4 8 12] */ - movq_r2r(mm4, mm3); // mm3 = [ 2 6 3 7] - punpckhdq_r2r(mm2, mm1); // mm1 = final result mm1 = row2 [1 5 9 13] + movq_r2r(mm4, mm3); /* mm3 = [ 2 6 3 7] */ + punpckhdq_r2r(mm2, mm1); /* mm1 = final result mm1 = row2 [1 5 9 13] */ - movq_r2m(mm0, *(inptr + ROW_STRIDE * 0)); // store row 1 - punpckldq_r2r(mm6, mm4); // final result mm4 = row3 [2 6 10 14] + movq_r2m(mm0, *(inptr + ROW_STRIDE * 0)); /* store row 1 */ + punpckldq_r2r(mm6, mm4); /* final result mm4 = row3 [2 6 10 14] */ -// begin reading next quadrant (lower-right) +/* begin reading next quadrant (lower-right) */ movq_m2r(*(out + ROW_STRIDE*4 + 4), mm0); - punpckhdq_r2r(mm6, mm3); // final result mm3 = row4 [3 7 11 15] + punpckhdq_r2r(mm6, mm3); /* final result mm3 = row4 [3 7 11 15] */ - movq_r2m(mm4, *(inptr + ROW_STRIDE * 2)); // store row 3 - movq_r2r(mm0, mm4); // mm4 = copy of row1[A B C D] + movq_r2m(mm4, *(inptr + ROW_STRIDE * 2)); /* store row 3 */ + movq_r2r(mm0, mm4); /* mm4 = copy of row1[A B C D] */ - movq_r2m(mm1, *(inptr + ROW_STRIDE * 1)); // store row 2 + movq_r2m(mm1, *(inptr + ROW_STRIDE * 1)); /* store row 2 */ movq_m2r(*(out + ROW_STRIDE*5 + 4), mm1); - movq_r2m(mm3, *(inptr + ROW_STRIDE * 3)); // store row 4 - punpcklwd_r2r(mm1, mm0); // mm0 = [ 0 4 1 5] + movq_r2m(mm3, *(inptr + ROW_STRIDE * 3)); /* store row 4 */ + punpcklwd_r2r(mm1, mm0); /* mm0 = [ 0 4 1 5] */ - // 2) transpose lower-right quadrant + /* 2) transpose lower-right quadrant */ -// movq mm0, qword ptr [OUT + ROW_STRIDE*4 + 8] +/* movq mm0, qword ptr [OUT + ROW_STRIDE*4 + 8] */ -// movq mm1, qword ptr [OUT + ROW_STRIDE*5 + 8] -// movq mm4, mm0; // mm4 = copy of row1[A B C D] +/* movq mm1, qword ptr [OUT + ROW_STRIDE*5 + 8] */ +/* movq mm4, mm0; // mm4 = copy of row1[A B C D] */ movq_m2r(*(out + ROW_STRIDE*6 + 4), mm2); -// punpcklwd mm0, mm1; // mm0 = [ 0 4 1 5] - punpckhwd_r2r(mm1, mm4); // mm4 = [ 2 6 3 7] +/* punpcklwd mm0, mm1; // mm0 = [ 0 4 1 5] */ + punpckhwd_r2r(mm1, mm4); /* mm4 = [ 2 6 3 7] */ movq_m2r(*(out + ROW_STRIDE*7 + 4), mm3); movq_r2r(mm2, mm6); - punpcklwd_r2r(mm3, mm2); // mm2 = [ 8 12 9 13] - movq_r2r(mm0, mm1); // mm1 = [ 0 4 1 5] + punpcklwd_r2r(mm3, mm2); /* mm2 = [ 8 12 9 13] */ + movq_r2r(mm0, mm1); /* mm1 = [ 0 4 1 5] */ - punpckhwd_r2r(mm3, mm6); // mm6 = 10 14 11 15] - movq_r2r(mm4, mm3); // mm3 = [ 2 6 3 7] + punpckhwd_r2r(mm3, mm6); /* mm6 = 10 14 11 15] */ + movq_r2r(mm4, mm3); /* mm3 = [ 2 6 3 7] */ - punpckldq_r2r(mm2, mm0); // final result mm0 = row1 [0 4 8 12] + punpckldq_r2r(mm2, mm0); /* final result mm0 = row1 [0 4 8 12] */ - punpckhdq_r2r(mm2, mm1); // mm1 = final result mm1 = row2 [1 5 9 13] - ; // slot + punpckhdq_r2r(mm2, mm1); /* mm1 = final result mm1 = row2 [1 5 9 13] */ + ; /* slot */ - movq_r2m(mm0, *(inptr + ROW_STRIDE*4 + 4)); // store row 1 - punpckldq_r2r(mm6, mm4); // final result mm4 = row3 [2 6 10 14] + movq_r2m(mm0, *(inptr + ROW_STRIDE*4 + 4)); /* store row 1 */ + punpckldq_r2r(mm6, mm4); /* final result mm4 = row3 [2 6 10 14] */ movq_m2r(*(out + ROW_STRIDE * 4 ), mm0); - punpckhdq_r2r(mm6, mm3); // final result mm3 = row4 [3 7 11 15] + punpckhdq_r2r(mm6, mm3); /* final result mm3 = row4 [3 7 11 15] */ - movq_r2m(mm4, *(inptr + ROW_STRIDE*6 + 4)); // store row 3 - movq_r2r(mm0, mm4); // mm4 = copy of row1[A B C D] + movq_r2m(mm4, *(inptr + ROW_STRIDE*6 + 4)); /* store row 3 */ + movq_r2r(mm0, mm4); /* mm4 = copy of row1[A B C D] */ - movq_r2m(mm1, *(inptr + ROW_STRIDE*5 + 4)); // store row 2 - ; // slot + movq_r2m(mm1, *(inptr + ROW_STRIDE*5 + 4)); /* store row 2 */ + ; /* slot */ movq_m2r(*(out + ROW_STRIDE * 5 ), mm1); - ; // slot + ; /* slot */ - movq_r2m(mm3, *(inptr + ROW_STRIDE*7 + 4)); // store row 4 - punpcklwd_r2r(mm1, mm0); // mm0 = [ 0 4 1 5] + movq_r2m(mm3, *(inptr + ROW_STRIDE*7 + 4)); /* store row 4 */ + punpcklwd_r2r(mm1, mm0); /* mm0 = [ 0 4 1 5] */ - // 3) transpose lower-left -// movq mm0, qword ptr [OUT + ROW_STRIDE * 4 ] + /* 3) transpose lower-left */ +/* movq mm0, qword ptr [OUT + ROW_STRIDE * 4 ] */ -// movq mm1, qword ptr [OUT + ROW_STRIDE * 5 ] -// movq mm4, mm0; // mm4 = copy of row1[A B C D] +/* movq mm1, qword ptr [OUT + ROW_STRIDE * 5 ] */ +/* movq mm4, mm0; // mm4 = copy of row1[A B C D] */ movq_m2r(*(out + ROW_STRIDE * 6 ), mm2); -// punpcklwd mm0, mm1; // mm0 = [ 0 4 1 5] - punpckhwd_r2r(mm1, mm4); // mm4 = [ 2 6 3 7] +/* punpcklwd mm0, mm1; // mm0 = [ 0 4 1 5] */ + punpckhwd_r2r(mm1, mm4); /* mm4 = [ 2 6 3 7] */ movq_m2r(*(out + ROW_STRIDE * 7 ), mm3); movq_r2r(mm2, mm6); - punpcklwd_r2r(mm3, mm2); // mm2 = [ 8 12 9 13] - movq_r2r(mm0, mm1); // mm1 = [ 0 4 1 5] + punpcklwd_r2r(mm3, mm2); /* mm2 = [ 8 12 9 13] */ + movq_r2r(mm0, mm1); /* mm1 = [ 0 4 1 5] */ - punpckhwd_r2r(mm3, mm6); // mm6 = 10 14 11 15] - movq_r2r(mm4, mm3); // mm3 = [ 2 6 3 7] + punpckhwd_r2r(mm3, mm6); /* mm6 = 10 14 11 15] */ + movq_r2r(mm4, mm3); /* mm3 = [ 2 6 3 7] */ - punpckldq_r2r(mm2, mm0); // final result mm0 = row1 [0 4 8 12] + punpckldq_r2r(mm2, mm0); /* final result mm0 = row1 [0 4 8 12] */ - punpckhdq_r2r(mm2, mm1); // mm1 = final result mm1 = row2 [1 5 9 13] - ;//slot + punpckhdq_r2r(mm2, mm1); /* mm1 = final result mm1 = row2 [1 5 9 13] */ + ;/*slot */ - movq_r2m(mm0, *(inptr + ROW_STRIDE * 0 + 4 )); // store row 1 - punpckldq_r2r(mm6, mm4); // final result mm4 = row3 [2 6 10 14] + movq_r2m(mm0, *(inptr + ROW_STRIDE * 0 + 4 )); /* store row 1 */ + punpckldq_r2r(mm6, mm4); /* final result mm4 = row3 [2 6 10 14] */ -// begin reading next quadrant (upper-right) +/* begin reading next quadrant (upper-right) */ movq_m2r(*(out + ROW_STRIDE*0 + 4), mm0); - punpckhdq_r2r(mm6, mm3); // final result mm3 = row4 [3 7 11 15] + punpckhdq_r2r(mm6, mm3); /* final result mm3 = row4 [3 7 11 15] */ - movq_r2m(mm4, *(inptr + ROW_STRIDE * 2 + 4)); // store row 3 - movq_r2r(mm0, mm4); // mm4 = copy of row1[A B C D] + movq_r2m(mm4, *(inptr + ROW_STRIDE * 2 + 4)); /* store row 3 */ + movq_r2r(mm0, mm4); /* mm4 = copy of row1[A B C D] */ - movq_r2m(mm1, *(inptr + ROW_STRIDE * 1 + 4)); // store row 2 + movq_r2m(mm1, *(inptr + ROW_STRIDE * 1 + 4)); /* store row 2 */ movq_m2r(*(out + ROW_STRIDE*1 + 4), mm1); - movq_r2m(mm3, *(inptr + ROW_STRIDE * 3 + 4)); // store row 4 - punpcklwd_r2r(mm1, mm0); // mm0 = [ 0 4 1 5] + movq_r2m(mm3, *(inptr + ROW_STRIDE * 3 + 4)); /* store row 4 */ + punpcklwd_r2r(mm1, mm0); /* mm0 = [ 0 4 1 5] */ - // 2) transpose lower-right quadrant + /* 2) transpose lower-right quadrant */ -// movq mm0, qword ptr [OUT + ROW_STRIDE*4 + 8] +/* movq mm0, qword ptr [OUT + ROW_STRIDE*4 + 8] */ -// movq mm1, qword ptr [OUT + ROW_STRIDE*5 + 8] -// movq mm4, mm0; // mm4 = copy of row1[A B C D] +/* movq mm1, qword ptr [OUT + ROW_STRIDE*5 + 8] */ +/* movq mm4, mm0; // mm4 = copy of row1[A B C D] */ movq_m2r(*(out + ROW_STRIDE*2 + 4), mm2); -// punpcklwd mm0, mm1; // mm0 = [ 0 4 1 5] - punpckhwd_r2r(mm1, mm4); // mm4 = [ 2 6 3 7] +/* punpcklwd mm0, mm1; // mm0 = [ 0 4 1 5] */ + punpckhwd_r2r(mm1, mm4); /* mm4 = [ 2 6 3 7] */ movq_m2r(*(out + ROW_STRIDE*3 + 4), mm3); movq_r2r(mm2, mm6); - punpcklwd_r2r(mm3, mm2); // mm2 = [ 8 12 9 13] - movq_r2r(mm0, mm1); // mm1 = [ 0 4 1 5] + punpcklwd_r2r(mm3, mm2); /* mm2 = [ 8 12 9 13] */ + movq_r2r(mm0, mm1); /* mm1 = [ 0 4 1 5] */ - punpckhwd_r2r(mm3, mm6); // mm6 = 10 14 11 15] - movq_r2r(mm4, mm3); // mm3 = [ 2 6 3 7] + punpckhwd_r2r(mm3, mm6); /* mm6 = 10 14 11 15] */ + movq_r2r(mm4, mm3); /* mm3 = [ 2 6 3 7] */ - punpckldq_r2r(mm2, mm0); // final result mm0 = row1 [0 4 8 12] + punpckldq_r2r(mm2, mm0); /* final result mm0 = row1 [0 4 8 12] */ - punpckhdq_r2r(mm2, mm1); // mm1 = final result mm1 = row2 [1 5 9 13] - ; // slot + punpckhdq_r2r(mm2, mm1); /* mm1 = final result mm1 = row2 [1 5 9 13] */ + ; /* slot */ - movq_r2m(mm0, *(inptr + ROW_STRIDE*4)); // store row 1 - punpckldq_r2r(mm6, mm4); // final result mm4 = row3 [2 6 10 14] + movq_r2m(mm0, *(inptr + ROW_STRIDE*4)); /* store row 1 */ + punpckldq_r2r(mm6, mm4); /* final result mm4 = row3 [2 6 10 14] */ - movq_r2m(mm1, *(inptr + ROW_STRIDE*5)); // store row 2 - punpckhdq_r2r(mm6, mm3); // final result mm3 = row4 [3 7 11 15] + movq_r2m(mm1, *(inptr + ROW_STRIDE*5)); /* store row 2 */ + punpckhdq_r2r(mm6, mm3); /* final result mm3 = row4 [3 7 11 15] */ - movq_r2m(mm4, *(inptr + ROW_STRIDE*6)); // store row 3 - ; // slot + movq_r2m(mm4, *(inptr + ROW_STRIDE*6)); /* store row 3 */ + ; /* slot */ - movq_r2m(mm3, *(inptr + ROW_STRIDE*7)); // store row 4 - ; // slot + movq_r2m(mm3, *(inptr + ROW_STRIDE*7)); /* store row 4 */ + ; /* slot */ } static void -idct_mmx32_cols( short *blk ) // transform all 8 cols of 8x8 iDCT block +idct_mmx32_cols( short *blk ) /* transform all 8 cols of 8x8 iDCT block */ { int x; short *inptr = blk; - // Despite the function's name, the matrix is transformed - // row by row. This function is identical to idct_mmx32_rows(), - // except for the SHIFT amount and ROUND_INV amount. + /* Despite the function's name, the matrix is transformed */ + /* row by row. This function is identical to idct_mmx32_rows(), */ + /* except for the SHIFT amount and ROUND_INV amount. */ - // this subroutine performs two operations - // 1) iDCT row transform - // for( i = 0; i < 8; ++ i) - // DCT_8_INV_ROW_1( blk[i*8], qwTemp[i] ); - // - // 2) transpose the matrix (which was stored in qwTemp[]) - // qwTemp[] -> [8x8 matrix transpose] -> blk[] + /* this subroutine performs two operations */ + /* 1) iDCT row transform */ + /* for( i = 0; i < 8; ++ i) */ + /* DCT_8_INV_ROW_1( blk[i*8], qwTemp[i] ); */ + /* */ + /* 2) transpose the matrix (which was stored in qwTemp[]) */ + /* qwTemp[] -> [8x8 matrix transpose] -> blk[] */ - for (x=0; x<8; x++) { // transform one row per iteration + for (x=0; x<8; x++) { /* transform one row per iteration */ - movq_m2r(*(inptr), mm0); // 0 ; x3 x2 x1 x0 + movq_m2r(*(inptr), mm0); /* 0 ; x3 x2 x1 x0 */ - movq_m2r(*(inptr+4), mm1); // 1 ; x7 x6 x5 x4 - movq_r2r(mm0, mm2); // 2 ; x3 x2 x1 x0 + movq_m2r(*(inptr+4), mm1); /* 1 ; x7 x6 x5 x4 */ + movq_r2r(mm0, mm2); /* 2 ; x3 x2 x1 x0 */ - movq_m2r(*(tab_i_01234567), mm3); // 3 ; w06 w04 w02 w00 - punpcklwd_r2r(mm1, mm0); // x5 x1 x4 x0 + movq_m2r(*(tab_i_01234567), mm3); /* 3 ; w06 w04 w02 w00 */ + punpcklwd_r2r(mm1, mm0); /* x5 x1 x4 x0 */ -// ---------- - movq_r2r(mm0, mm5); // 5 ; x5 x1 x4 x0 - punpckldq_r2r(mm0, mm0); // x4 x0 x4 x0 +/* ---------- */ + movq_r2r(mm0, mm5); /* 5 ; x5 x1 x4 x0 */ + punpckldq_r2r(mm0, mm0); /* x4 x0 x4 x0 */ - movq_m2r(*(tab_i_01234567+4), mm4); // 4 ; w07 w05 w03 w01 - punpckhwd_r2r(mm1, mm2); // 1 ; x7 x3 x6 x2 + movq_m2r(*(tab_i_01234567+4), mm4); /* 4 ; w07 w05 w03 w01 */ + punpckhwd_r2r(mm1, mm2); /* 1 ; x7 x3 x6 x2 */ - pmaddwd_r2r(mm0, mm3); // x4*w06+x0*w04 x4*w02+x0*w00 - movq_r2r(mm2, mm6); // 6 ; x7 x3 x6 x2 + pmaddwd_r2r(mm0, mm3); /* x4*w06+x0*w04 x4*w02+x0*w00 */ + movq_r2r(mm2, mm6); /* 6 ; x7 x3 x6 x2 */ - movq_m2r(*(tab_i_01234567+16), mm1);// 1 ; w22 w20 w18 w16 - punpckldq_r2r(mm2, mm2); // x6 x2 x6 x2 + movq_m2r(*(tab_i_01234567+16), mm1);/* 1 ; w22 w20 w18 w16 */ + punpckldq_r2r(mm2, mm2); /* x6 x2 x6 x2 */ - pmaddwd_r2r(mm2, mm4); // x6*w07+x2*w05 x6*w03+x2*w01 - punpckhdq_r2r(mm5, mm5); // x5 x1 x5 x1 + pmaddwd_r2r(mm2, mm4); /* x6*w07+x2*w05 x6*w03+x2*w01 */ + punpckhdq_r2r(mm5, mm5); /* x5 x1 x5 x1 */ - pmaddwd_m2r(*(tab_i_01234567+8), mm0);// x4*w14+x0*w12 x4*w10+x0*w08 - punpckhdq_r2r(mm6, mm6); // x7 x3 x7 x3 + pmaddwd_m2r(*(tab_i_01234567+8), mm0);/* x4*w14+x0*w12 x4*w10+x0*w08 */ + punpckhdq_r2r(mm6, mm6); /* x7 x3 x7 x3 */ - movq_m2r(*(tab_i_01234567+20), mm7);// 7 ; w23 w21 w19 w17 - pmaddwd_r2r(mm5, mm1); // x5*w22+x1*w20 x5*w18+x1*w16 + movq_m2r(*(tab_i_01234567+20), mm7);/* 7 ; w23 w21 w19 w17 */ + pmaddwd_r2r(mm5, mm1); /* x5*w22+x1*w20 x5*w18+x1*w16 */ - paddd_m2r(*(r_inv_col), mm3);// +rounder - pmaddwd_r2r(mm6, mm7); // x7*w23+x3*w21 x7*w19+x3*w17 + paddd_m2r(*(r_inv_col), mm3);/* +rounder */ + pmaddwd_r2r(mm6, mm7); /* x7*w23+x3*w21 x7*w19+x3*w17 */ - pmaddwd_m2r(*(tab_i_01234567+12), mm2);// x6*w15+x2*w13 x6*w11+x2*w09 - paddd_r2r(mm4, mm3); // 4 ; a1=sum(even1) a0=sum(even0) + pmaddwd_m2r(*(tab_i_01234567+12), mm2);/* x6*w15+x2*w13 x6*w11+x2*w09 */ + paddd_r2r(mm4, mm3); /* 4 ; a1=sum(even1) a0=sum(even0) */ - pmaddwd_m2r(*(tab_i_01234567+24), mm5);// x5*w30+x1*w28 x5*w26+x1*w24 - movq_r2r(mm3, mm4); // 4 ; a1 a0 + pmaddwd_m2r(*(tab_i_01234567+24), mm5);/* x5*w30+x1*w28 x5*w26+x1*w24 */ + movq_r2r(mm3, mm4); /* 4 ; a1 a0 */ - pmaddwd_m2r(*(tab_i_01234567+28), mm6);// x7*w31+x3*w29 x7*w27+x3*w25 - paddd_r2r(mm7, mm1); // 7 ; b1=sum(odd1) b0=sum(odd0) + pmaddwd_m2r(*(tab_i_01234567+28), mm6);/* x7*w31+x3*w29 x7*w27+x3*w25 */ + paddd_r2r(mm7, mm1); /* 7 ; b1=sum(odd1) b0=sum(odd0) */ - paddd_m2r(*(r_inv_col), mm0);// +rounder - psubd_r2r(mm1, mm3); // a1-b1 a0-b0 + paddd_m2r(*(r_inv_col), mm0);/* +rounder */ + psubd_r2r(mm1, mm3); /* a1-b1 a0-b0 */ - psrad_i2r(SHIFT_INV_COL, mm3); // y6=a1-b1 y7=a0-b0 - paddd_r2r(mm4, mm1); // 4 ; a1+b1 a0+b0 + psrad_i2r(SHIFT_INV_COL, mm3); /* y6=a1-b1 y7=a0-b0 */ + paddd_r2r(mm4, mm1); /* 4 ; a1+b1 a0+b0 */ - paddd_r2r(mm2, mm0); // 2 ; a3=sum(even3) a2=sum(even2) - psrad_i2r(SHIFT_INV_COL, mm1); // y1=a1+b1 y0=a0+b0 + paddd_r2r(mm2, mm0); /* 2 ; a3=sum(even3) a2=sum(even2) */ + psrad_i2r(SHIFT_INV_COL, mm1); /* y1=a1+b1 y0=a0+b0 */ - paddd_r2r(mm6, mm5); // 6 ; b3=sum(odd3) b2=sum(odd2) - movq_r2r(mm0, mm4); // 4 ; a3 a2 + paddd_r2r(mm6, mm5); /* 6 ; b3=sum(odd3) b2=sum(odd2) */ + movq_r2r(mm0, mm4); /* 4 ; a3 a2 */ - paddd_r2r(mm5, mm0); // a3+b3 a2+b2 - psubd_r2r(mm5, mm4); // 5 ; a3-b3 a2-b2 + paddd_r2r(mm5, mm0); /* a3+b3 a2+b2 */ + psubd_r2r(mm5, mm4); /* 5 ; a3-b3 a2-b2 */ - psrad_i2r(SHIFT_INV_COL, mm4); // y4=a3-b3 y5=a2-b2 - psrad_i2r(SHIFT_INV_COL, mm0); // y3=a3+b3 y2=a2+b2 + psrad_i2r(SHIFT_INV_COL, mm4); /* y4=a3-b3 y5=a2-b2 */ + psrad_i2r(SHIFT_INV_COL, mm0); /* y3=a3+b3 y2=a2+b2 */ - packssdw_r2r(mm3, mm4); // 3 ; y6 y7 y4 y5 + packssdw_r2r(mm3, mm4); /* 3 ; y6 y7 y4 y5 */ - packssdw_r2r(mm0, mm1); // 0 ; y3 y2 y1 y0 - movq_r2r(mm4, mm7); // 7 ; y6 y7 y4 y5 + packssdw_r2r(mm0, mm1); /* 0 ; y3 y2 y1 y0 */ + movq_r2r(mm4, mm7); /* 7 ; y6 y7 y4 y5 */ - psrld_i2r(16, mm4); // 0 y6 0 y4 + psrld_i2r(16, mm4); /* 0 y6 0 y4 */ - movq_r2m(mm1, *(inptr)); // 1 ; save y3 y2 y1 y0 - pslld_i2r(16, mm7); // y7 0 y5 0 + movq_r2m(mm1, *(inptr)); /* 1 ; save y3 y2 y1 y0 */ + pslld_i2r(16, mm7); /* y7 0 y5 0 */ - por_r2r(mm4, mm7); // 4 ; y7 y6 y5 y4 + por_r2r(mm4, mm7); /* 4 ; y7 y6 y5 y4 */ - // begin processing row 1 - movq_r2m(mm7, *(inptr+4)); // 7 ; save y7 y6 y5 y4 + /* begin processing row 1 */ + movq_r2m(mm7, *(inptr+4)); /* 7 ; save y7 y6 y5 y4 */ inptr += 8; } - // done with the iDCT column-transformation + /* done with the iDCT column-transformation */ } -// -// public interface to MMX32 IDCT 8x8 operation -// +/* */ +/* public interface to MMX32 IDCT 8x8 operation */ +/* */ void gst_idct_mmx32_idct( short *blk ) { - // 1) iDCT row transformation - idct_mmx32_rows( blk ); // 1) transform iDCT row, and transpose + /* 1) iDCT row transformation */ + idct_mmx32_rows( blk ); /* 1) transform iDCT row, and transpose */ - // 2) iDCT column transformation - idct_mmx32_cols( blk ); // 2) transform iDCT row, and transpose + /* 2) iDCT column transformation */ + idct_mmx32_cols( blk ); /* 2) transform iDCT row, and transpose */ - emms(); // restore processor state - // all done + emms(); /* restore processor state */ + /* all done */ } diff --git a/gst-libs/gst/resample/Makefile.am b/gst-libs/gst/resample/Makefile.am index c1def79d12..f705678936 100644 --- a/gst-libs/gst/resample/Makefile.am +++ b/gst-libs/gst/resample/Makefile.am @@ -13,7 +13,7 @@ endif endif libgstresample_la_SOURCES = dtos.c functable.c resample.c resample.h -libgstresample_la_LIBADD = $(GST_LIBS) +libgstresample_la_LIBADD = libgstresample_la_CFLAGS = $(GST_CFLAGS) -ffast-math $(ARCHCFLAGS) libgstresample_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/gst-libs/gst/resample/dtos.c b/gst-libs/gst/resample/dtos.c index 7762595fae..96bfe41d64 100644 --- a/gst-libs/gst/resample/dtos.c +++ b/gst-libs/gst/resample/dtos.c @@ -23,13 +23,13 @@ #include #include -//#include +/*#include */ #include #define short_to_double_table -//#define short_to_double_altivec +/*#define short_to_double_altivec */ #define short_to_double_unroll #ifdef short_to_double_table diff --git a/gst-libs/gst/resample/functable.c b/gst-libs/gst/resample/functable.c index d61efca498..c225958eab 100644 --- a/gst-libs/gst/resample/functable.c +++ b/gst-libs/gst/resample/functable.c @@ -124,12 +124,12 @@ double functable_eval(functable_t *t,double x) w0 = (x - 2 * x2 + x3) * t->offset; w1 = (-x2 + x3) * t->offset; - //printf("i=%d x=%g f0=%g f1=%g w0=%g w1=%g\n",i,x,f0,f1,w0,w1); + /*printf("i=%d x=%g f0=%g f1=%g w0=%g w1=%g\n",i,x,f0,f1,w0,w1); */ w = t->fx[i] * f0 + t->fx[i + 1] * f1 + t->fdx[i] * w0 + t->fdx[i + 1] * w1; - //w = t->fx[i] * (1-x) + t->fx[i+1] * x; + /*w = t->fx[i] * (1-x) + t->fx[i+1] * x; */ return w; } @@ -266,37 +266,37 @@ void functable_fir2_altivec(functable_t *t, float *r0, float *r1, sum0 = 0; sum1 = 0; for(j=0;jfx, t->fdx needs to be multiplexed by n - // we need 5 consecutive floats, which fit into 2 vecs - // load v0, t->fx[i] - // load v1, t->fx[i+n] - // v2 = v0 (not correct) - // v3 = (v0>>32) || (v1<<3*32) (not correct) - // - // load v4, t->dfx[i] - // load v5, t->dfx[i+n] - // v6 = v4 (not correct) - // v7 = (v4>>32) || (v5<<3*32) (not correct) - // - // v8 = splat(f0) - // v9 = splat(f1) - // v10 = splat(w0) - // v11 = splat(w1) - // - // v12 = v2 * v8 - // v12 += v3 * v9 - // v12 += v6 * v10 - // v12 += v7 * v11 + /* t->fx, t->fdx needs to be multiplexed by n */ + /* we need 5 consecutive floats, which fit into 2 vecs */ + /* load v0, t->fx[i] */ + /* load v1, t->fx[i+n] */ + /* v2 = v0 (not correct) */ + /* v3 = (v0>>32) || (v1<<3*32) (not correct) */ + /* */ + /* load v4, t->dfx[i] */ + /* load v5, t->dfx[i+n] */ + /* v6 = v4 (not correct) */ + /* v7 = (v4>>32) || (v5<<3*32) (not correct) */ + /* */ + /* v8 = splat(f0) */ + /* v9 = splat(f1) */ + /* v10 = splat(w0) */ + /* v11 = splat(w1) */ + /* */ + /* v12 = v2 * v8 */ + /* v12 += v3 * v9 */ + /* v12 += v6 * v10 */ + /* v12 += v7 * v11 */ w = t->fx[i] * f0 + t->fx[i + 1] * f1 + t->fdx[i] * w0 + t->fdx[i + 1] * w1; - // v13 = data[j*2] - // v14 = data[j*2+4] - // v15 = deinterlace_high(v13,v14) - // v16 = deinterlace_low(v13,v14) - // (sum0) v17 += multsum(v13,v15) - // (sum1) v18 += multsum(v14,v16) + /* v13 = data[j*2] */ + /* v14 = data[j*2+4] */ + /* v15 = deinterlace_high(v13,v14) */ + /* v16 = deinterlace_low(v13,v14) */ + /* (sum0) v17 += multsum(v13,v15) */ + /* (sum1) v18 += multsum(v14,v16) */ sum0 += data[j*2] * w; sum1 += data[j*2+1] * w; diff --git a/gst-libs/gst/resample/resample.c b/gst-libs/gst/resample/resample.c index cedb874e2f..286cb84b28 100644 --- a/gst-libs/gst/resample/resample.c +++ b/gst-libs/gst/resample/resample.c @@ -243,7 +243,7 @@ void resample_bilinear(resample_t * r) b = r->i_start; for (i = 0; i < r->i_samples; i++) { b += r->i_inc; - //printf("in %d\n",i_ptr[0]); + /*printf("in %d\n",i_ptr[0]); */ if(b>=2){ printf("not expecting b>=2\n"); } @@ -252,7 +252,7 @@ void resample_bilinear(resample_t * r) acc1 += (1.0 - (b-r->i_inc)) * i_ptr[1]; o_ptr[0] = rint(acc0); - //printf("out %d\n",o_ptr[0]); + /*printf("out %d\n",o_ptr[0]); */ o_ptr[1] = rint(acc1); o_ptr += 2; o_count++; @@ -319,8 +319,8 @@ void resample_sinc_slow(resample_t * r) c1 = 0; for (j = 0; j < r->filter_length; j++) { weight = (x==0)?1:(sinx/x); -//printf("j %d sin %g cos %g\n",j,sinx,cosx); -//printf("j %d sin %g x %g sinc %g\n",j,sinx,x,weight); +/*printf("j %d sin %g cos %g\n",j,sinx,cosx); */ +/*printf("j %d sin %g x %g sinc %g\n",j,sinx,x,weight); */ c0 += weight * GETBUF((start + j), 0); c1 += weight * GETBUF((start + j), 1); t = cosx * cosd - sinx * sind; @@ -368,11 +368,11 @@ void resample_sinc(resample_t * r) for (i = 0; i < r->o_samples; i++) { a = r->o_start + i * r->o_inc; start = floor(a - r->halftaps); -//printf("%d: a=%g start=%d end=%d\n",i,a,start,start+r->filter_length-1); +/*printf("%d: a=%g start=%d end=%d\n",i,a,start,start+r->filter_length-1); */ center = a; - //x = M_PI * (start - center) * r->o_inc; - //d = M_PI * r->o_inc; - //x = (start - center) * r->o_inc; + /*x = M_PI * (start - center) * r->o_inc; */ + /*d = M_PI * r->o_inc; */ + /*x = (start - center) * r->o_inc; */ x0 = (start - center) * r->o_inc; d = r->o_inc; c0 = 0; @@ -439,20 +439,20 @@ static void resample_sinc_ft(resample_t * r) double *ptr; signed short *o_ptr; int i; - //int j; + /*int j; */ double c0, c1; - //double a; + /*double a; */ double start_f, start_x; int start; double center; - //double weight; + /*double weight; */ double x, d; double scale; int n = 4; - scale = r->i_inc; // cutoff at 22050 - //scale = 1.0; // cutoff at 24000 - //scale = r->i_inc * 0.5; // cutoff at 11025 + scale = r->i_inc; /* cutoff at 22050 */ + /*scale = 1.0; // cutoff at 24000 */ + /*scale = r->i_inc * 0.5; // cutoff at 11025 */ if(!ft){ ft = malloc(sizeof(*ft)); @@ -472,7 +472,7 @@ static void resample_sinc_ft(resample_t * r) functable_init(ft); - //printf("len=%d offset=%g start=%g\n",ft->len,ft->offset,ft->start); + /*printf("len=%d offset=%g start=%g\n",ft->len,ft->offset,ft->start); */ } ptr = r->buffer; @@ -484,18 +484,18 @@ static void resample_sinc_ft(resample_t * r) start_x -= start_f; start = start_f; for (i = 0; i < r->o_samples; i++) { - //start_f = floor(center - r->halftaps); -//printf("%d: a=%g start=%d end=%d\n",i,a,start,start+r->filter_length-1); + /*start_f = floor(center - r->halftaps); */ +/*printf("%d: a=%g start=%d end=%d\n",i,a,start,start+r->filter_length-1); */ x = start_f - center; d = 1; c0 = 0; c1 = 0; -//#define slow +/*#define slow */ #ifdef slow for (j = 0; j < r->filter_length; j++) { weight = functable_eval(ft,x)*scale; - //weight = sinc(M_PI * scale * x)*scale*r->i_inc; - //weight *= window_func(x / r->halftaps); + /*weight = sinc(M_PI * scale * x)*scale*r->i_inc; */ + /*weight *= window_func(x / r->halftaps); */ c0 += weight * ptr[(start + j + r->filter_length)*2 + 0]; c1 += weight * ptr[(start + j + r->filter_length)*2 + 1]; x += d; diff --git a/gst-libs/gst/resample/test.c b/gst-libs/gst/resample/test.c index 44d19a6517..f268a59299 100644 --- a/gst-libs/gst/resample/test.c +++ b/gst-libs/gst/resample/test.c @@ -9,11 +9,11 @@ #define AMP 16000 #define I_RATE 48000 #define O_RATE 44100 -//#define O_RATE 24000 +/*#define O_RATE 24000 */ -//#define test_func(x) 1 -//#define test_func(x) sin(2*M_PI*(x)*10) -//#define test_func(x) sin(2*M_PI*(x)*(x)*1000) +/*#define test_func(x) 1 */ +/*#define test_func(x) sin(2*M_PI*(x)*10) */ +/*#define test_func(x) sin(2*M_PI*(x)*(x)*1000) */ #define test_func(x) sin(2*M_PI*(x)*(x)*12000) short i_buf[I_RATE*2*2]; @@ -53,7 +53,7 @@ struct timeval start_time; void start_timer(void) { gettimeofday(&start_time,NULL); - //printf("start %ld.%06ld\n",start_time.tv_sec,start_time.tv_usec); + /*printf("start %ld.%06ld\n",start_time.tv_sec,start_time.tv_usec); */ } void end_timer(void) @@ -62,7 +62,7 @@ void end_timer(void) double diff; gettimeofday(&end_time,NULL); - //printf("end %ld.%06ld\n",end_time.tv_sec,end_time.tv_usec); + /*printf("end %ld.%06ld\n",end_time.tv_sec,end_time.tv_usec); */ diff = (end_time.tv_sec - start_time.tv_sec) + 1e-6*(end_time.tv_usec - start_time.tv_usec); @@ -81,7 +81,7 @@ void test_res1(void) for(i=0;ii_rate = I_RATE; r->o_rate = O_RATE; - //r->method = RESAMPLE_SINC_SLOW; + /*r->method = RESAMPLE_SINC_SLOW; */ r->method = RESAMPLE_SINC; r->channels = 2; - //r->verbose = 1; + /*r->verbose = 1; */ r->filter_length = 64; r->get_buffer = get_buffer; @@ -115,7 +115,7 @@ void test_res1(void) for(i=0;ii_rate = I_RATE; r->o_rate = O_RATE; - //r->method = RESAMPLE_SINC_SLOW; + /*r->method = RESAMPLE_SINC_SLOW; */ r->method = RESAMPLE_SINC; r->channels = 1; - //r->verbose = 1; + /*r->verbose = 1; */ r->filter_length = 64; r->get_buffer = get_buffer; @@ -322,7 +322,7 @@ void test_res7(void) for(i=0;i -//#define debug(format,args...) g_print(format,##args) +/*#define debug(format,args...) g_print(format,##args) */ #define debug(format,args...) @@ -69,33 +69,33 @@ gint gst_riff_next_buffer(GstRiff *riff,GstBuffer *buf,gulong off) { GST_BUFFER_DATA(buf) = riff->dataleft; GST_BUFFER_SIZE(buf) = newsize; off -= riff->dataleft_size; - //last -= riff->dataleft_size; + /*last -= riff->dataleft_size; */ riff->dataleft = NULL; } if (off == 0) { guint32 *words = (guin32 *)GST_BUFFER_DATA(buf); - // don't even try to parse the head if it's not there FIXME + /* don't even try to parse the head if it's not there FIXME */ if (last < 12) { riff->state = GST_RIFF_ENOTRIFF; return riff->state; } - //g_print("testing is 0x%08lx '%s'\n",words[0],gst_riff_id_to_fourcc(words[0])); + /*g_print("testing is 0x%08lx '%s'\n",words[0],gst_riff_id_to_fourcc(words[0])); */ /* verify this is a valid RIFF file, first of all */ if (GUINT32_FROM_LE (words[0]) != GST_RIFF_TAG_RIFF) { riff->state = GST_RIFF_ENOTRIFF; return riff->state; } riff->form = GUINT32_FROM_LE (words[2]); - //g_print("form is 0x%08lx '%s'\n",words[2],gst_riff_id_to_fourcc(words[2])); + /*g_print("form is 0x%08lx '%s'\n",words[2],gst_riff_id_to_fourcc(words[2])); */ riff->nextlikely = 12; /* skip 'RIFF', length, and form */ - // all OK here + /* all OK here */ riff->incomplete_chunk = NULL; } - // if we have an incomplete chunk from the previous buffer + /* if we have an incomplete chunk from the previous buffer */ if (riff->incomplete_chunk) { guint leftover; debug("have incomplete chunk %08x filled\n", riff->incomplete_chunk_size); @@ -135,14 +135,14 @@ gint gst_riff_next_buffer(GstRiff *riff,GstBuffer *buf,gulong off) { while ((riff->nextlikely+12) <= last) { guin32 *words = (guin32 *)((guchar *)GST_BUFFER_DATA(buf) + riff->nextlikely - off ); - // loop over all of the chunks to check which one is finished + /* loop over all of the chunks to check which one is finished */ while (riff->chunks) { chunk = g_list_nth_data(riff->chunks, 0); debug("next 0x%08x offset 0x%08lx size 0x%08x\n",riff->nextlikely, chunk->offset, chunk->size); if (riff->nextlikely >= chunk->offset+chunk->size) { - //g_print("found END LIST\n"); - // we have the end of the chunk on the stack, remove it + /*g_print("found END LIST\n"); */ + /* we have the end of the chunk on the stack, remove it */ riff->chunks = g_list_remove(riff->chunks, chunk); } else break; @@ -157,17 +157,17 @@ gint gst_riff_next_buffer(GstRiff *riff,GstBuffer *buf,gulong off) { chunk->id = GUINT32_FROM_LE (words[0])); chunk->size = GUINT32_FROM_LE (words[1]); chunk->data = (gchar *)(words+2); - // we need word alignment - //if (chunk->size & 0x01) chunk->size++; + /* we need word alignment */ + /*if (chunk->size & 0x01) chunk->size++; */ chunk->form = GUINT32_FROM_LE (words[2]); /* fill in the form, might not be valid */ if (chunk->id == GST_RIFF_TAG_LIST) { - //g_print("found LIST %s\n", gst_riff_id_to_fourcc(chunk->form)); + /*g_print("found LIST %s\n", gst_riff_id_to_fourcc(chunk->form)); */ riff->nextlikely += 12; - // we push the list chunk on our 'stack' + /* we push the list chunk on our 'stack' */ riff->chunks = g_list_prepend(riff->chunks,chunk); - // send the buffer to the listener if we have received a function + /* send the buffer to the listener if we have received a function */ if (riff->new_tag_found) { riff->new_tag_found(chunk, riff->callback_data); } @@ -178,25 +178,25 @@ gint gst_riff_next_buffer(GstRiff *riff,GstBuffer *buf,gulong off) { gst_riff_id_to_fourcc(GUINT32_FROM_LE (words[0])), GUINT32_FROM_LE (words[1])); riff->nextlikely += 8 + chunk->size; /* doesn't include hdr */ - // if this buffer is incomplete + /* if this buffer is incomplete */ if (riff->nextlikely > last) { guint left = size - (riff->nextlikely - chunk->size - off); - //g_print("make incomplete buffer %08x\n", left); + /*g_print("make incomplete buffer %08x\n", left); */ chunk->data = g_malloc(chunk->size); memcpy(chunk->data, (gchar *)(words+2), left); riff->incomplete_chunk = chunk; riff->incomplete_chunk_size = left; } else { - // send the buffer to the listener if we have received a function + /* send the buffer to the listener if we have received a function */ if (riff->new_tag_found) { riff->new_tag_found(chunk, riff->callback_data); } g_free(chunk); } - //riff->chunks = g_list_prepend(riff->chunks,chunk); + /*riff->chunks = g_list_prepend(riff->chunks,chunk); */ } } diff --git a/gst-libs/gst/riff/riffencode.c b/gst-libs/gst/riff/riffencode.c index a6caed9ee5..febf259946 100644 --- a/gst-libs/gst/riff/riffencode.c +++ b/gst-libs/gst/riff/riffencode.c @@ -19,7 +19,7 @@ #include -//#define DEBUG_ENABLED +/*#define DEBUG_ENABLED */ #include "riff.h" #define GST_RIFF_ENCODER_BUF_SIZE 1024 diff --git a/gst-libs/gst/riff/riffparse.c b/gst-libs/gst/riff/riffparse.c index eb4746fcfe..c7fa3f755c 100644 --- a/gst-libs/gst/riff/riffparse.c +++ b/gst-libs/gst/riff/riffparse.c @@ -19,7 +19,7 @@ #include -//#define DEBUG_ENABLED +/*#define DEBUG_ENABLED */ #include GstRiff* @@ -71,33 +71,33 @@ gst_riff_parser_next_buffer (GstRiff *riff, GstBuffer *buf, gulong off) GST_BUFFER_DATA(buf) = riff->dataleft; size = GST_BUFFER_SIZE(buf) = newsize; off -= riff->dataleft_size; - //last -= riff->dataleft_size; + /*last -= riff->dataleft_size; */ riff->dataleft = NULL; } if (off == 0) { guint32 *words = (guint32 *)GST_BUFFER_DATA(buf); - // don't even try to parse the head if it's not there FIXME + /* don't even try to parse the head if it's not there FIXME */ if (last < 12) { riff->state = GST_RIFF_ENOTRIFF; return riff->state; } - //g_print("testing is 0x%08lx '%s'\n",words[0],gst_riff_id_to_fourcc(words[0])); + /*g_print("testing is 0x%08lx '%s'\n",words[0],gst_riff_id_to_fourcc(words[0])); */ /* verify this is a valid RIFF file, first of all */ if (GUINT32_FROM_LE (words[0]) != GST_RIFF_TAG_RIFF) { riff->state = GST_RIFF_ENOTRIFF; return riff->state; } riff->form = GUINT32_FROM_LE (words[2]); - //g_print("form is 0x%08lx '%s'\n",words[2],gst_riff_id_to_fourcc(words[2])); + /*g_print("form is 0x%08lx '%s'\n",words[2],gst_riff_id_to_fourcc(words[2])); */ riff->nextlikely = 12; /* skip 'RIFF', length, and form */ - // all OK here + /* all OK here */ riff->incomplete_chunk = NULL; } - // if we have an incomplete chunk from the previous buffer + /* if we have an incomplete chunk from the previous buffer */ if (riff->incomplete_chunk) { guint leftover; GST_DEBUG (0,"gst_riff_parser: have incomplete chunk %08x filled\n", riff->incomplete_chunk_size); @@ -130,7 +130,7 @@ gst_riff_parser_next_buffer (GstRiff *riff, GstBuffer *buf, gulong off) while ((riff->nextlikely+12) <= last) { guint32 *words = (guint32 *)((guchar *)GST_BUFFER_DATA(buf) + riff->nextlikely - off ); - // loop over all of the chunks to check which one is finished + /* loop over all of the chunks to check which one is finished */ while (riff->chunks) { chunk = g_list_nth_data(riff->chunks, 0); @@ -138,7 +138,7 @@ gst_riff_parser_next_buffer (GstRiff *riff, GstBuffer *buf, gulong off) chunk->offset, chunk->size); if (riff->nextlikely >= chunk->offset+chunk->size) { GST_DEBUG (0,"gst_riff_parser: found END LIST\n"); - // we have the end of the chunk on the stack, remove it + /* we have the end of the chunk on the stack, remove it */ riff->chunks = g_list_remove(riff->chunks, chunk); } else break; @@ -153,17 +153,17 @@ gst_riff_parser_next_buffer (GstRiff *riff, GstBuffer *buf, gulong off) chunk->id = GUINT32_FROM_LE (words[0]); chunk->size = GUINT32_FROM_LE (words[1]); chunk->data = (gchar *)(words+2); - // we need word alignment - //if (chunk->size & 0x01) chunk->size++; + /* we need word alignment */ + /*if (chunk->size & 0x01) chunk->size++; */ chunk->form = GUINT32_FROM_LE (words[2]); /* fill in the form, might not be valid */ if (chunk->id == GST_RIFF_TAG_LIST) { GST_DEBUG (0,"found LIST %s\n", gst_riff_id_to_fourcc(chunk->form)); riff->nextlikely += 12; - // we push the list chunk on our 'stack' + /* we push the list chunk on our 'stack' */ riff->chunks = g_list_prepend(riff->chunks,chunk); - // send the buffer to the listener if we have received a function + /* send the buffer to the listener if we have received a function */ if (riff->new_tag_found) { riff->new_tag_found(chunk, riff->callback_data); } @@ -175,7 +175,7 @@ gst_riff_parser_next_buffer (GstRiff *riff, GstBuffer *buf, gulong off) gst_riff_id_to_fourcc(GUINT32_FROM_LE (words[0])), GUINT32_FROM_LE (words[1])); riff->nextlikely += 8 + chunk->size; /* doesn't include hdr */ - // if this buffer is incomplete + /* if this buffer is incomplete */ if (riff->nextlikely > last) { guint left = size - (riff->nextlikely - chunk->size - off); @@ -186,7 +186,7 @@ gst_riff_parser_next_buffer (GstRiff *riff, GstBuffer *buf, gulong off) riff->incomplete_chunk_size = left; } else { - // send the buffer to the listener if we have received a function + /* send the buffer to the listener if we have received a function */ if (riff->new_tag_found) { riff->new_tag_found(chunk, riff->callback_data); } @@ -194,7 +194,7 @@ gst_riff_parser_next_buffer (GstRiff *riff, GstBuffer *buf, gulong off) } if (riff->nextlikely & 0x01) riff->nextlikely++; - //riff->chunks = g_list_prepend(riff->chunks,chunk); + /*riff->chunks = g_list_prepend(riff->chunks,chunk); */ } } if ((riff->nextlikely+12) > last && !riff->incomplete_chunk) { diff --git a/gst-libs/gst/riff/riffutil.c b/gst-libs/gst/riff/riffutil.c index ca01f6e615..9005279f3b 100644 --- a/gst-libs/gst/riff/riffutil.c +++ b/gst-libs/gst/riff/riffutil.c @@ -20,7 +20,7 @@ #include -//#define debug(format,args...) g_print(format,##args) +/*#define debug(format,args...) g_print(format,##args) */ #define debug(format,args...) diff --git a/gst/ac3parse/Makefile.am b/gst/ac3parse/Makefile.am index 88f2d2e7a1..21aa850c2f 100644 --- a/gst/ac3parse/Makefile.am +++ b/gst/ac3parse/Makefile.am @@ -7,7 +7,7 @@ libgstac3parse_la_SOURCES = gstac3parse.c noinst_HEADERS = gstac3parse.h libgstac3parse_la_CFLAGS = -O3 $(FOMIT_FRAME_POINTER) -funroll-all-loops -finline-functions -ffast-math $(GST_CFLAGS) -libgstac3parse_la_LIBADD = $(GST_LIBS) +libgstac3parse_la_LIBADD = libgstac3parse_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) EXTRA_DIST = README diff --git a/gst/mpegaudioparse/Makefile.am b/gst/mpegaudioparse/Makefile.am index 4ce1aa3d60..c2e9649f4a 100644 --- a/gst/mpegaudioparse/Makefile.am +++ b/gst/mpegaudioparse/Makefile.am @@ -6,12 +6,12 @@ plugin_LTLIBRARIES = libgstmpegaudioparse.la libgstmp3types.la libgstmpegaudioparse_la_SOURCES = gstmpegaudioparse.c # FIXME is this useful? libgstmpegaudioparse_la_CFLAGS = -O3 $(FOMIT_FRAME_POINTER) -ffast-math -finline-functions $(GST_CFLAGS) -libgstmpegaudioparse_la_LIBADD = $(GST_LIBS) +libgstmpegaudioparse_la_LIBADD = libgstmpegaudioparse_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstmp3types_la_SOURCES = gstmp3types.c libgstmp3types_la_CFLAGS = -O3 $(FOMIT_FRAME_POINTER) -ffast-math -finline-functions $(GST_CFLAGS) -libgstmp3types_la_LIBADD = $(GST_LIBS) +libgstmp3types_la_LIBADD = libgstmp3types_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) noinst_HEADERS = gstmpegaudioparse.h diff --git a/gst/mpegaudioparse/gstmp3types.c b/gst/mpegaudioparse/gstmp3types.c index a14094ce90..69429fccee 100644 --- a/gst/mpegaudioparse/gstmp3types.c +++ b/gst/mpegaudioparse/gstmp3types.c @@ -17,7 +17,7 @@ * Boston, MA 02111-1307, USA. */ -//#define DEBUG_ENABLED +/*#define DEBUG_ENABLED */ #include #include /* memcmp */ diff --git a/gst/mpegaudioparse/gstmpegaudioparse.c b/gst/mpegaudioparse/gstmpegaudioparse.c index 9e19b319d7..0787d2944a 100644 --- a/gst/mpegaudioparse/gstmpegaudioparse.c +++ b/gst/mpegaudioparse/gstmpegaudioparse.c @@ -17,7 +17,7 @@ * Boston, MA 02111-1307, USA. */ -//#define GST_DEBUG_ENABLED +/*#define GST_DEBUG_ENABLED */ #include @@ -94,7 +94,7 @@ static void gst_mp3parse_set_property (GObject *object, guint prop_id, const GV static void gst_mp3parse_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec); static GstElementClass *parent_class = NULL; -//static guint gst_mp3parse_signals[LAST_SIGNAL] = { 0 }; +/*static guint gst_mp3parse_signals[LAST_SIGNAL] = { 0 }; */ GType gst_mp3parse_get_type(void) { @@ -127,10 +127,10 @@ gst_mp3parse_class_init (GstMPEGAudioParseClass *klass) g_object_class_install_property(G_OBJECT_CLASS(klass), ARG_SKIP, g_param_spec_int("skip","skip","skip", - 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_BIT_RATE, g_param_spec_int("bit_rate","bit_rate","bit_rate", - G_MININT,G_MAXINT,0,G_PARAM_READABLE)); // CHECKME + G_MININT,G_MAXINT,0,G_PARAM_READABLE)); /* CHECKME */ parent_class = g_type_class_ref(GST_TYPE_ELEMENT); @@ -144,15 +144,15 @@ gst_mp3parse_init (GstMPEGAudioParse *mp3parse) mp3parse->sinkpad = gst_pad_new_from_template(sink_temp, "sink"); gst_element_add_pad(GST_ELEMENT(mp3parse),mp3parse->sinkpad); -#if 1 // set this to one to use the old chaining code +#if 1 /* set this to one to use the old chaining code */ gst_pad_set_chain_function(mp3parse->sinkpad,gst_mp3parse_chain); -#else // else you get the new loop-based code, which isn't complete yet +#else /* else you get the new loop-based code, which isn't complete yet */ gst_element_set_loop_function (GST_ELEMENT(mp3parse),gst_mp3parse_loop); #endif mp3parse->srcpad = gst_pad_new_from_template(src_temp, "src"); gst_element_add_pad(GST_ELEMENT(mp3parse),mp3parse->srcpad); - //gst_pad_set_type_id(mp3parse->srcpad, mp3frametype); + /*gst_pad_set_type_id(mp3parse->srcpad, mp3frametype); */ mp3parse->partialbuf = NULL; mp3parse->skip = 0; @@ -190,31 +190,31 @@ gst_mp3parse_loop (GstElement *element) gint bpf; while (1) { - // get a new buffer + /* get a new buffer */ inbuf = gst_pad_pull (parse->sinkpad); size = GST_BUFFER_SIZE (inbuf); data = GST_BUFFER_DATA (inbuf); offset = 0; fprintf(stderr, "have buffer of %d bytes\n",size); - // loop through it and find all the frames + /* loop through it and find all the frames */ while (offset < (size - 4)) { start = gst_mp3parse_next_header (data,size,offset); fprintf(stderr, "skipped %d bytes searching for the next header\n",start-offset); header = GULONG_FROM_BE(*((guint32 *)(data+start))); fprintf(stderr, "header is 0x%08x\n",header); - // figure out how big the frame is supposed to be + /* figure out how big the frame is supposed to be */ bpf = bpf_from_header (parse, header); - // see if there are enough bytes in this buffer for the whole frame + /* see if there are enough bytes in this buffer for the whole frame */ if ((start + bpf) <= size) { outbuf = gst_buffer_create_sub (inbuf,start,bpf); fprintf(stderr, "sending buffer of %d bytes\n",bpf); gst_pad_push (parse->srcpad, outbuf); offset = start + bpf; - // if not, we have to deal with it somehow + /* if not, we have to deal with it somehow */ } else { fprintf(stderr,"don't have enough data for this frame\n"); @@ -238,7 +238,7 @@ gst_mp3parse_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)); */ mp3parse = GST_MP3PARSE (gst_pad_get_parent (pad)); @@ -255,11 +255,11 @@ gst_mp3parse_chain (GstPad *pad, GstBuffer *buf) mp3parse->in_flush = TRUE; */ - // if we have something left from the previous frame + /* if we have something left from the previous frame */ if (mp3parse->partialbuf) { mp3parse->partialbuf = gst_buffer_append(mp3parse->partialbuf, buf); - // and the one we received.. + /* and the one we received.. */ gst_buffer_unref(buf); } else { @@ -269,22 +269,22 @@ gst_mp3parse_chain (GstPad *pad, GstBuffer *buf) size = GST_BUFFER_SIZE(mp3parse->partialbuf); data = GST_BUFFER_DATA(mp3parse->partialbuf); - // while we still have bytes left -4 for the header + /* while we still have bytes left -4 for the header */ while (offset < size-4) { int skipped = 0; GST_DEBUG (0,"mp3parse: offset %ld, size %ld \n",offset, size); - // search for a possible start byte + /* search for a possible start byte */ for (;((data[offset] != 0xff) && (offset < size));offset++) skipped++; if (skipped && !mp3parse->in_flush) { GST_DEBUG (0,"mp3parse: **** now at %ld skipped %d bytes\n",offset,skipped); } - // construct the header word + /* construct the header word */ header = GULONG_FROM_BE(*((gulong *)(data+offset))); - // if it's a valid header, go ahead and send off the frame + /* if it's a valid header, go ahead and send off the frame */ if (head_check(header)) { - // calculate the bpf of the frame + /* calculate the bpf of the frame */ bpf = bpf_from_header(mp3parse, header); /******************************************************************************** @@ -302,22 +302,22 @@ gst_mp3parse_chain (GstPad *pad, GstBuffer *buf) if ( mp3parse->in_flush ) { unsigned long header2; - if ((size-offset)<(bpf+4)) { if (mp3parse->in_flush) break; } // wait until we have the the entire current frame as well as the next frame header + if ((size-offset)<(bpf+4)) { if (mp3parse->in_flush) break; } /* wait until we have the the entire current frame as well as the next frame header */ header2 = GULONG_FROM_BE(*((gulong *)(data+offset+bpf))); GST_DEBUG(0,"mp3parse: header=%08lX, header2=%08lX, bpf=%d\n", header, header2, bpf ); - #define HDRMASK ~( (0xF<<12)/*bitrate*/ | (1<<9)/*padding*/ | (3<<4)/*mode extension*/ ) // mask the bits which are allowed to differ between frames + #define HDRMASK ~( (0xF<<12)/*bitrate*/ | (1<<9)/*padding*/ | (3<<4)/*mode extension*/ ) /* mask the bits which are allowed to differ between frames */ - if ( (header2&HDRMASK) != (header&HDRMASK) ) { // require 2 matching headers in a row + if ( (header2&HDRMASK) != (header&HDRMASK) ) { /* require 2 matching headers in a row */ GST_DEBUG(0,"mp3parse: next header doesn't match (header=%08lX, header2=%08lX, bpf=%d)\n", header, header2, bpf ); - offset++; // This frame is invalid. Start looking for a valid frame at the next position in the stream + offset++; /* This frame is invalid. Start looking for a valid frame at the next position in the stream */ continue; } } - // if we don't have the whole frame... + /* if we don't have the whole frame... */ if ((size - offset) < bpf) { GST_DEBUG (0,"mp3parse: partial buffer needed %ld < %d \n",(size-offset), bpf); break; @@ -346,8 +346,8 @@ gst_mp3parse_chain (GstPad *pad, GstBuffer *buf) if (!mp3parse->in_flush) GST_DEBUG (0,"mp3parse: *** wrong header, skipping byte (FIXME?)\n"); } } - // if we have processed this block and there are still - // bytes left not in a partial block, copy them over. + /* if we have processed this block and there are still */ + /* bytes left not in a partial block, copy them over. */ if (size-offset > 0) { glong remainder = (size - offset); GST_DEBUG (0,"mp3parse: partial buffer needed %ld for trailing bytes\n",remainder); @@ -381,7 +381,7 @@ bpf_from_header (GstMPEGAudioParse *parse, unsigned long header) int layer_index,layer,lsf,samplerate_index,padding; long bpf; - //mpegver = (header >> 19) & 0x3; // don't need this for bpf + /*mpegver = (header >> 19) & 0x3; // don't need this for bpf */ layer_index = (header >> 17) & 0x3; layer = 4 - layer_index; lsf = (header & (1 << 20)) ? ((header & (1 << 19)) ? 0 : 1) : 1; @@ -399,8 +399,8 @@ bpf_from_header (GstMPEGAudioParse *parse, unsigned long header) bpf += padding; } - //g_print("%08x: layer %d lsf %d bitrate %d samplerate_index %d padding %d - bpf %d\n", -//header,layer,lsf,bitrate,samplerate_index,padding,bpf); + /*g_print("%08x: layer %d lsf %d bitrate %d samplerate_index %d padding %d - bpf %d\n", */ +/*header,layer,lsf,bitrate,samplerate_index,padding,bpf); */ return bpf; } diff --git a/gst/mpegaudioparse/gstmpegaudioparse.h b/gst/mpegaudioparse/gstmpegaudioparse.h index fbd1047efb..5252703026 100644 --- a/gst/mpegaudioparse/gstmpegaudioparse.h +++ b/gst/mpegaudioparse/gstmpegaudioparse.h @@ -50,7 +50,7 @@ struct _GstMPEGAudioParse { GstPad *sinkpad,*srcpad; - GstBuffer *partialbuf; // previous buffer (if carryover) + GstBuffer *partialbuf; /* previous buffer (if carryover) */ guint skip; /* number of frames to skip */ guint bit_rate; gboolean in_flush; diff --git a/gst/mpegstream/Makefile.am b/gst/mpegstream/Makefile.am index 57a37281e2..2433f3efde 100644 --- a/gst/mpegstream/Makefile.am +++ b/gst/mpegstream/Makefile.am @@ -4,7 +4,7 @@ plugin_LTLIBRARIES = libgstmpegstream.la libgstmpegstream_la_SOURCES = gstmpegstream.c gstmpegparse.c gstmpegdemux.c gstmpegpacketize.c gstrfc2250enc.c libgstmpegstream_la_CFLAGS = $(GST_CFLAGS) -O3 $(FOMIT_FRAME_POINTER) -ffast-math -libgstmpegstream_la_LIBADD = $(GST_LIBS) +libgstmpegstream_la_LIBADD = libgstmpegstream_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) noinst_HEADERS = gstmpegparse.h gstmpegdemux.h gstmpegpacketize.h gstrfc2250enc.h diff --git a/gst/synaesthesia/Makefile.am b/gst/synaesthesia/Makefile.am index 261ec6cee0..05588a7d78 100644 --- a/gst/synaesthesia/Makefile.am +++ b/gst/synaesthesia/Makefile.am @@ -7,6 +7,6 @@ libgstsynaesthesia_la_SOURCES = gstsynaesthesia.c synaescope.c noinst_HEADERS = synaescope.h libgstsynaesthesia_la_CFLAGS = -O2 -ffast-math $(GST_CFLAGS) -libgstsynaesthesia_la_LIBADD = $(GST_LIBS) +libgstsynaesthesia_la_LIBADD = libgstsynaesthesia_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/gst/synaesthesia/gstsynaesthesia.c b/gst/synaesthesia/gstsynaesthesia.c index d02fd7cc6d..8757c35cfa 100644 --- a/gst/synaesthesia/gstsynaesthesia.c +++ b/gst/synaesthesia/gstsynaesthesia.c @@ -38,11 +38,11 @@ struct _GstSynaesthesia { GstPad *sinkpad,*srcpad; GstBufferPool *peerpool; - // the timestamp of the next frame + /* the timestamp of the next frame */ guint64 next_time; gint16 datain[2][512]; - // video state + /* video state */ gint fps; gint width; gint height; @@ -198,11 +198,11 @@ gst_synaesthesia_init (GstSynaesthesia *synaesthesia) synaesthesia->next_time = 0; synaesthesia->peerpool = NULL; - // reset the initial video state + /* reset the initial video state */ synaesthesia->first_buffer = TRUE; synaesthesia->width = 320; synaesthesia->height = 200; - synaesthesia->fps = 25; // desired frame rate + synaesthesia->fps = 25; /* desired frame rate */ } diff --git a/gst/synaesthesia/synaescope.c b/gst/synaesthesia/synaescope.c index 827fcc0a06..ae5ea7e03c 100644 --- a/gst/synaesthesia/synaescope.c +++ b/gst/synaesthesia/synaescope.c @@ -140,25 +140,25 @@ static void synaescope_coreGo(void) { ( (x1+x2) * (x1-x2) + (y1+y2) * (y1-y2) )/(aa+bb) * 256 ); } - // Asger Alstrupt's optimized 32 bit fade - // (alstrup@diku.dk) + /* Asger Alstrupt's optimized 32 bit fade */ + /* (alstrup@diku.dk) */ ptr = (unsigned long*)output; end = (unsigned long*)(output + syn_width * syn_height * 2); do { - //Bytewize version was: *(ptr++) -= *ptr+(*ptr>>1)>>4; + /*Bytewize version was: *(ptr++) -= *ptr+(*ptr>>1)>>4; */ if (*ptr) if (*ptr & 0xf0f0f0f0) *ptr = *ptr - ((*ptr & 0xf0f0f0f0) >> 4) - ((*ptr & 0xe0e0e0e0) >> 5); else { *ptr = (*ptr * 14 >> 4) & 0x0f0f0f0f; - //Should be 29/32 to be consistent. Who cares. This is totally - // hacked anyway. - //unsigned char *subptr = (unsigned char*)(ptr++); - //subptr[0] = (int)subptr[0] * 29 / 32; - //subptr[1] = (int)subptr[0] * 29 / 32; - //subptr[2] = (int)subptr[0] * 29 / 32; - //subptr[3] = (int)subptr[0] * 29 / 32; + /*Should be 29/32 to be consistent. Who cares. This is totally */ + /* hacked anyway. */ + /*unsigned char *subptr = (unsigned char*)(ptr++); */ + /*subptr[0] = (int)subptr[0] * 29 / 32; */ + /*subptr[1] = (int)subptr[0] * 29 / 32; */ + /*subptr[2] = (int)subptr[0] * 29 / 32; */ + /*subptr[3] = (int)subptr[0] * 29 / 32; */ } ptr++; } while(ptr < end); @@ -173,10 +173,10 @@ static void synaescope_coreGo(void) { brtot = 0; for(i=1;i 0 || corr_r[i] > 0) { int h = (int)( corr_r[i] * syn_width / (corr_l[i]+corr_r[i]) ); -// int h = (int)( syn_width - 1 ); +/* int h = (int)( syn_width - 1 ); */ int br1, br2, br = (int)( (corr_l[i]+corr_r[i])*i*brightFactor2 ); int px = h, @@ -186,7 +186,7 @@ static void synaescope_coreGo(void) { br2 = br*(128-clarity[i])>>8; if (br1 < 0) br1 = 0; else if (br1 > 255) br1 = 255; if (br2 < 0) br2 = 0; else if (br2 > 255) br2 = 255; - //unsigned char *p = output+ h*2+(164-((i<<8)>>FFT_BUFFER_SIZE_LOG))*(syn_width*2); + /*unsigned char *p = output+ h*2+(164-((i<<8)>>FFT_BUFFER_SIZE_LOG))*(syn_width*2); */ if (px < 30 || py < 30 || px > syn_width-30 || py > syn_height-30) { addPixel(output, px,py,br1,br2); @@ -289,7 +289,7 @@ static void synaescope16(void *data) colEq[i] = color.pixel; } - // Create render image + /* Create render image */ if (image) { gdk_image_destroy(image); image = NULL; @@ -342,7 +342,7 @@ static void synaescope8(void *data) colEq[i * 4 + 3] = color.pixel; } - // Create render image + /* Create render image */ if (image) { gdk_image_destroy(image); image = NULL; @@ -409,13 +409,13 @@ static void init_synaescope() for(i = 0; i <= FFT_BUFFER_SIZE / 2 + 1; i++) { double mult = (double)128 / ((FFT_BUFFER_SIZE * 16384) ^ 2); - // Result now guaranteed (well, almost) to be in range 0..128 + /* Result now guaranteed (well, almost) to be in range 0..128 */ - // Low values represent more frequencies, and thus get more - // intensity - this helps correct for that. + /* Low values represent more frequencies, and thus get more */ + /* intensity - this helps correct for that. */ mult *= log(i + 1) / log(2); - mult *= 3; // Adhoc parameter, looks about right for me. + mult *= 3; /* Adhoc parameter, looks about right for me. */ fftmult[i] = mult; }