diff options
author | Sebastian Dröge <slomo@circular-chaos.org> | 2007-09-06 07:21:22 +0000 |
---|---|---|
committer | Sebastian Dröge <slomo@circular-chaos.org> | 2007-09-06 07:21:22 +0000 |
commit | f5a3e61e69af1c030aec87b6e23660a526640f2d (patch) | |
tree | cca56fea39cdb3fbfc9a721607883a85edc54172 /tests/examples | |
parent | c8af2199d324ee9b055777fda0800b9438ab7262 (diff) |
Port GstSpectrum to GstAudioFilter and libgstfft, add support for int32, float and double, use floats for the message...
Original commit message from CVS:
* configure.ac:
* gst/spectrum/Makefile.am:
* gst/spectrum/demo-audiotest.c: (draw_spectrum),
(message_handler), (main):
* gst/spectrum/demo-osssrc.c: (draw_spectrum), (message_handler):
* gst/spectrum/gstspectrum.c: (gst_spectrum_base_init),
(gst_spectrum_class_init), (gst_spectrum_init),
(gst_spectrum_dispose), (gst_spectrum_set_property),
(gst_spectrum_get_property), (gst_spectrum_start),
(gst_spectrum_setup), (gst_spectrum_message_new),
(gst_spectrum_transform_ip):
* gst/spectrum/gstspectrum.h:
Port GstSpectrum to GstAudioFilter and libgstfft, add support
for int32, float and double, use floats for the message contents,
average all FFTs done in one interval for better results, use
a better windowing function, allow posting the phase in the message
and actually do an FFT with the requested number of bands instead
of interpolating.
* tests/check/elements/spectrum.c: (GST_START_TEST),
(spectrum_suite):
Improve the units tests by checking for a 11025Hz sine wave
and add unit tests for all 4 supported sample types.
Diffstat (limited to 'tests/examples')
-rw-r--r-- | tests/examples/spectrum/demo-audiotest.c | 16 | ||||
-rw-r--r-- | tests/examples/spectrum/demo-osssrc.c | 8 |
2 files changed, 13 insertions, 11 deletions
diff --git a/tests/examples/spectrum/demo-audiotest.c b/tests/examples/spectrum/demo-audiotest.c index edb1d1dc..b9f59ba5 100644 --- a/tests/examples/spectrum/demo-audiotest.c +++ b/tests/examples/spectrum/demo-audiotest.c @@ -51,7 +51,7 @@ on_frequency_changed (GtkRange * range, gpointer user_data) /* draw frequency spectrum as a bunch of bars */ static void -draw_spectrum (guchar * data) +draw_spectrum (gfloat * data) { gint i; GdkRectangle rect = { 0, 0, SPECT_BANDS, 50 }; @@ -78,15 +78,15 @@ message_handler (GstBus * bus, GstMessage * message, gpointer data) const gchar *name = gst_structure_get_name (s); if (strcmp (name, "spectrum") == 0) { - guchar spect[SPECT_BANDS]; + gfloat spect[SPECT_BANDS]; const GValue *list; const GValue *value; guint i; - list = gst_structure_get_value (s, "spectrum"); + list = gst_structure_get_value (s, "magnitude"); for (i = 0; i < SPECT_BANDS; ++i) { value = gst_value_list_get_value (list, i); - spect[i] = g_value_get_uchar (value); + spect[i] = g_value_get_float (value); } draw_spectrum (spect); } @@ -98,7 +98,7 @@ int main (int argc, char *argv[]) { GstElement *bin; - GstElement *src, *spectrum, *sink; + GstElement *src, *spectrum, *audioconvert, *sink; GstBus *bus; GtkWidget *appwindow, *vbox, *widget; @@ -116,10 +116,12 @@ main (int argc, char *argv[]) g_object_set (G_OBJECT (spectrum), "bands", SPECT_BANDS, "threshold", -80, "message", TRUE, NULL); + audioconvert = gst_element_factory_make ("audioconvert", "audioconvert"); + sink = gst_element_factory_make (DEFAULT_AUDIOSINK, "sink"); - gst_bin_add_many (GST_BIN (bin), src, spectrum, sink, NULL); - if (!gst_element_link_many (src, spectrum, sink, NULL)) { + gst_bin_add_many (GST_BIN (bin), src, spectrum, audioconvert, sink, NULL); + if (!gst_element_link_many (src, spectrum, audioconvert, sink, NULL)) { fprintf (stderr, "cant link elements\n"); exit (1); } diff --git a/tests/examples/spectrum/demo-osssrc.c b/tests/examples/spectrum/demo-osssrc.c index b71843e6..6c106b26 100644 --- a/tests/examples/spectrum/demo-osssrc.c +++ b/tests/examples/spectrum/demo-osssrc.c @@ -43,7 +43,7 @@ on_window_destroy (GtkObject * object, gpointer user_data) /* draw frequency spectrum as a bunch of bars */ static void -draw_spectrum (guchar * data) +draw_spectrum (gfloat * data) { gint i; GdkRectangle rect = { 0, 0, SPECT_WIDTH, SPECT_HEIGHT }; @@ -70,15 +70,15 @@ message_handler (GstBus * bus, GstMessage * message, gpointer data) const gchar *name = gst_structure_get_name (s); if (strcmp (name, "spectrum") == 0) { - guchar spect[SPECT_BANDS]; + gfloat spect[SPECT_BANDS]; const GValue *list; const GValue *value; guint i; - list = gst_structure_get_value (s, "spectrum"); + list = gst_structure_get_value (s, "magnitude"); for (i = 0; i < SPECT_BANDS; ++i) { value = gst_value_list_get_value (list, i); - spect[i] = g_value_get_uchar (value); + spect[i] = g_value_get_float (value); } draw_spectrum (spect); } |