From 1d5d8e1397535425815eeeb252e9213b77b57ef4 Mon Sep 17 00:00:00 2001 From: Jan Schmidt Date: Fri, 8 Feb 2008 03:28:57 +0000 Subject: Move spectrum plugin from -bad. Original commit message from CVS: * configure.ac: * docs/plugins/Makefile.am: * docs/plugins/gst-plugins-good-plugins-docs.sgml: * docs/plugins/gst-plugins-good-plugins-sections.txt: * docs/plugins/gst-plugins-good-plugins.args: * docs/plugins/gst-plugins-good-plugins.hierarchy: * docs/plugins/inspect/plugin-spectrum.xml: * gst/spectrum/Makefile.am: * tests/check/Makefile.am: * tests/check/elements/.cvsignore: * tests/examples/Makefile.am: Move spectrum plugin from -bad. Move examples into tests/examples/spectrum. --- ChangeLog | 17 ++++++ configure.ac | 3 ++ docs/plugins/Makefile.am | 1 + docs/plugins/gst-plugins-good-plugins-docs.sgml | 2 + docs/plugins/gst-plugins-good-plugins-sections.txt | 16 ++++++ docs/plugins/gst-plugins-good-plugins.args | 60 ++++++++++++++++++++++ docs/plugins/gst-plugins-good-plugins.hierarchy | 1 + docs/plugins/inspect/plugin-spectrum.xml | 34 ++++++++++++ gst/spectrum/Makefile.am | 12 ----- tests/check/Makefile.am | 1 + tests/check/elements/.gitignore | 1 + tests/examples/Makefile.am | 4 +- 12 files changed, 138 insertions(+), 14 deletions(-) create mode 100644 docs/plugins/inspect/plugin-spectrum.xml diff --git a/ChangeLog b/ChangeLog index ed9773a5..d618cf5d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,20 @@ +2008-02-08 Jan Schmidt + + * configure.ac: + * docs/plugins/Makefile.am: + * docs/plugins/gst-plugins-good-plugins-docs.sgml: + * docs/plugins/gst-plugins-good-plugins-sections.txt: + * docs/plugins/gst-plugins-good-plugins.args: + * docs/plugins/gst-plugins-good-plugins.hierarchy: + * docs/plugins/inspect/plugin-spectrum.xml: + * gst/spectrum/Makefile.am: + * tests/check/Makefile.am: + * tests/check/elements/.cvsignore: + * tests/examples/Makefile.am: + + Move spectrum plugin from -bad. + Move examples into tests/examples/spectrum. + 2008-02-08 Jan Schmidt * configure.ac: diff --git a/configure.ac b/configure.ac index 0fe788f1..2171d264 100644 --- a/configure.ac +++ b/configure.ac @@ -103,6 +103,7 @@ GST_PLUGINS_ALL="\ rtp \ rtsp \ smpte \ + spectrum \ udp \ videobox \ videocrop \ @@ -1026,6 +1027,7 @@ gst/qtdemux/Makefile gst/rtp/Makefile gst/rtsp/Makefile gst/smpte/Makefile +gst/spectrum/Makefile gst/udp/Makefile gst/videobox/Makefile gst/videocrop/Makefile @@ -1071,6 +1073,7 @@ tests/examples/Makefile tests/examples/equalizer/Makefile tests/examples/level/Makefile tests/examples/rtp/Makefile +tests/examples/spectrum/Makefile tests/files/Makefile tests/icles/Makefile gconf/Makefile diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am index 8384b765..81cd8ebf 100644 --- a/docs/plugins/Makefile.am +++ b/docs/plugins/Makefile.am @@ -124,6 +124,7 @@ EXTRA_HFILES = \ $(top_srcdir)/gst/qtdemux/qtdemux.h \ $(top_srcdir)/gst/rtsp/gstrtpdec.h \ $(top_srcdir)/gst/rtsp/gstrtspsrc.h \ + $(top_srcdir)/gst/spectrum/gstspectrum.h \ $(top_srcdir)/gst/udp/gstmultiudpsink.h \ $(top_srcdir)/gst/udp/gstudpsrc.h \ $(top_srcdir)/gst/videocrop/gstvideocrop.h \ diff --git a/docs/plugins/gst-plugins-good-plugins-docs.sgml b/docs/plugins/gst-plugins-good-plugins-docs.sgml index b711d34c..11aefca4 100644 --- a/docs/plugins/gst-plugins-good-plugins-docs.sgml +++ b/docs/plugins/gst-plugins-good-plugins-docs.sgml @@ -69,6 +69,7 @@ + @@ -134,6 +135,7 @@ + diff --git a/docs/plugins/gst-plugins-good-plugins-sections.txt b/docs/plugins/gst-plugins-good-plugins-sections.txt index db844a8b..b6d32003 100644 --- a/docs/plugins/gst-plugins-good-plugins-sections.txt +++ b/docs/plugins/gst-plugins-good-plugins-sections.txt @@ -880,6 +880,22 @@ GST_SMOKEENC_CLASS GST_IS_SMOKEENC_CLASS +
+element-spectrum +spectrum +GstSpectrum + +GstSpectrumClass +GstSpectrumFFTFreeFunc +GstSpectrumProcessFunc +GST_SPECTRUM +GST_SPECTRUM_CLASS +GST_IS_SPECTRUM +GST_IS_SPECTRUM_CLASS +GST_TYPE_SPECTRUM +gst_spectrum_get_type +
+
element-taglibmux taglibmux diff --git a/docs/plugins/gst-plugins-good-plugins.args b/docs/plugins/gst-plugins-good-plugins.args index f67e7379..38c959ee 100644 --- a/docs/plugins/gst-plugins-good-plugins.args +++ b/docs/plugins/gst-plugins-good-plugins.args @@ -158,6 +158,66 @@ "" + +GstSpectrum::bands +guint + +rw +Bands +number of frequency bands. +128 + + + +GstSpectrum::interval +guint64 +>= 1 +rw +Interval +Interval of time between message posts (in nanoseconds). +100000000 + + + +GstSpectrum::message +gboolean + +rw +Message +Post a level message for each passed interval. +TRUE + + + +GstSpectrum::threshold +gint +<= 0 +rw +Threshold +dB threshold for result. All lower values will be set to this. +-60 + + + +GstSpectrum::message-magnitude +gboolean + +rw +Magnitude +Post the magnitude of the spectrum. +TRUE + + + +GstSpectrum::message-phase +gboolean + +rw +Phase +Post the phase of the spectrum. +FALSE + + GstVideoflip::method GstVideoflipMethod diff --git a/docs/plugins/gst-plugins-good-plugins.hierarchy b/docs/plugins/gst-plugins-good-plugins.hierarchy index 5a72aa53..a25fee68 100644 --- a/docs/plugins/gst-plugins-good-plugins.hierarchy +++ b/docs/plugins/gst-plugins-good-plugins.hierarchy @@ -54,6 +54,7 @@ GObject GstIirEqualizerNBands GstIirEqualizer3Bands GstIirEqualizer10Bands + GstSpectrum GstAudioPanorama GstCairoTimeOverlay GstVideoFilter diff --git a/docs/plugins/inspect/plugin-spectrum.xml b/docs/plugins/inspect/plugin-spectrum.xml new file mode 100644 index 00000000..92f9e79d --- /dev/null +++ b/docs/plugins/inspect/plugin-spectrum.xml @@ -0,0 +1,34 @@ + + spectrum + Run an FFT on the audio signal, output spectrum data + ../../gst/spectrum/.libs/libgstspectrum.so + libgstspectrum.so + 0.10.6.1 + LGPL + gst-plugins-good + GStreamer Good Plug-ins CVS/prerelease + Unknown package origin + + + spectrum + Spectrum analyzer + Filter/Analyzer/Audio + Run an FFT on the audio signal, output spectrum data + Erik Walthinsen <omega@cse.ogi.edu>, Stefan Kost <ensonic@users.sf.net>, Sebastian Dröge <slomo@circular-chaos.org> + + + src + source + always +
audio/x-raw-int, width=(int)16, depth=(int)16, signed=(boolean)true, endianness=(int)1234, rate=(int)[ 1, 2147483647 ], channels=(int)[ 1, 2147483647 ]; audio/x-raw-int, width=(int)32, depth=(int)32, signed=(boolean)true, endianness=(int)1234, rate=(int)[ 1, 2147483647 ], channels=(int)[ 1, 2147483647 ]; audio/x-raw-float, width=(int){ 32, 64 }, endianness=(int)1234, rate=(int)[ 1, 2147483647 ], channels=(int)[ 1, 2147483647 ]
+ + + sink + sink + always +
audio/x-raw-int, width=(int)16, depth=(int)16, signed=(boolean)true, endianness=(int)1234, rate=(int)[ 1, 2147483647 ], channels=(int)[ 1, 2147483647 ]; audio/x-raw-int, width=(int)32, depth=(int)32, signed=(boolean)true, endianness=(int)1234, rate=(int)[ 1, 2147483647 ], channels=(int)[ 1, 2147483647 ]; audio/x-raw-float, width=(int){ 32, 64 }, endianness=(int)1234, rate=(int)[ 1, 2147483647 ], channels=(int)[ 1, 2147483647 ]
+ + + + + \ No newline at end of file diff --git a/gst/spectrum/Makefile.am b/gst/spectrum/Makefile.am index e161abbf..451d36d3 100644 --- a/gst/spectrum/Makefile.am +++ b/gst/spectrum/Makefile.am @@ -9,16 +9,4 @@ libgstspectrum_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) noinst_HEADERS = gstspectrum.h -if HAVE_GTK -noinst_PROGRAMS = demo-osssrc demo-audiotest -endif - -demo_osssrc_SOURCES = demo-osssrc.c -demo_osssrc_CFLAGS = $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(GTK_CFLAGS) -demo_osssrc_LDFLAGS = $(GST_BASE_LIBS) $(GST_LIBS) $(GTK_LIBS) - -demo_audiotest_SOURCES = demo-audiotest.c -demo_audiotest_CFLAGS = $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(GTK_CFLAGS) -demo_audiotest_LDFLAGS = $(GST_BASE_LIBS) $(GST_LIBS) $(GTK_LIBS) - EXTRA_DIST = README diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am index ff791a6c..0a5514a6 100644 --- a/tests/check/Makefile.am +++ b/tests/check/Makefile.am @@ -69,6 +69,7 @@ check_PROGRAMS = \ elements/level \ elements/matroskamux \ elements/rtp-payloading \ + elements/spectrum \ elements/videocrop \ elements/videofilter \ pipelines/simple-launch-lines \ diff --git a/tests/check/elements/.gitignore b/tests/check/elements/.gitignore index 1a8a5c58..695d8cf3 100644 --- a/tests/check/elements/.gitignore +++ b/tests/check/elements/.gitignore @@ -21,6 +21,7 @@ id3v2mux level matroskamux rtp-payloading +spectrum sunaudio videocrop videofilter diff --git a/tests/examples/Makefile.am b/tests/examples/Makefile.am index 1f9144f3..aad6dc18 100644 --- a/tests/examples/Makefile.am +++ b/tests/examples/Makefile.am @@ -1,3 +1,3 @@ -SUBDIRS = level rtp equalizer +SUBDIRS = equalizer level rtp spectrum -DIST_SUBDIRS = level rtp equalizer +DIST_SUBDIRS = equalizer level rtp spectrum -- cgit