From 83e305cf5dd437f5dd30f2ef78de18a2e8dc3438 Mon Sep 17 00:00:00 2001 From: Stefan Kost Date: Tue, 29 Jan 2008 07:38:31 +0000 Subject: Replace the switch plugin with the selector plugin. Add output- selector as the opposite of input-selectoo (was switc... Original commit message from CVS: * configure.ac: * docs/plugins/Makefile.am: * docs/plugins/gst-plugins-bad-plugins-docs.sgml: * docs/plugins/gst-plugins-bad-plugins-sections.txt: * docs/plugins/gst-plugins-bad-plugins.args: * docs/plugins/gst-plugins-bad-plugins.hierarchy: * docs/plugins/gst-plugins-bad-plugins.interfaces: * docs/plugins/gst-plugins-bad-plugins.signals: * docs/plugins/inspect/plugin-metadata.xml: * docs/plugins/inspect/plugin-selector.xml: * docs/plugins/inspect/plugin-soundtouch.xml: * docs/plugins/inspect/plugin-switch.xml: * gst/selector/.cvsignore: * gst/selector/Makefile.am: * gst/selector/gstinputselector.c: * gst/selector/gstinputselector.h: * gst/selector/gstoutputselector.c: * gst/selector/gstoutputselector.h: * gst/selector/gstselector-marshal.list: * gst/selector/gstselector.c: * gst/selector/selector.vcproj: * gst/switch/.cvsignore: * gst/switch/Makefile.am: * gst/switch/gstswitch-marshal.list: * gst/switch/gstswitch.c: * gst/switch/gstswitch.h: * gst/switch/switch.vcproj: * tests/icles/.cvsignore: * tests/icles/Makefile.am: * tests/icles/output-selector-test.c: Replace the switch plugin with the selector plugin. Add output- selector as the opposite of input-selectoo (was switch). Add a test for output-selector. Add docs for the elements. The vcproj needs update. Fixes #500142. --- docs/plugins/Makefile.am | 3 + docs/plugins/gst-plugins-bad-plugins-docs.sgml | 4 +- docs/plugins/gst-plugins-bad-plugins-sections.txt | 28 ++++ docs/plugins/gst-plugins-bad-plugins.args | 152 +++++++++++++--------- docs/plugins/gst-plugins-bad-plugins.hierarchy | 46 ++++--- docs/plugins/gst-plugins-bad-plugins.interfaces | 8 +- docs/plugins/gst-plugins-bad-plugins.signals | 17 +++ docs/plugins/inspect/plugin-metadata.xml | 24 ++-- docs/plugins/inspect/plugin-selector.xml | 55 ++++++++ docs/plugins/inspect/plugin-soundtouch.xml | 39 ++++-- docs/plugins/inspect/plugin-switch.xml | 34 ----- 11 files changed, 268 insertions(+), 142 deletions(-) create mode 100644 docs/plugins/inspect/plugin-selector.xml delete mode 100644 docs/plugins/inspect/plugin-switch.xml (limited to 'docs/plugins') diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am index 46d71d84..29b3300b 100644 --- a/docs/plugins/Makefile.am +++ b/docs/plugins/Makefile.am @@ -116,6 +116,7 @@ EXTRA_HFILES = \ $(top_srcdir)/ext/timidity/gsttimidity.h \ $(top_srcdir)/ext/timidity/gstwildmidi.h \ $(top_srcdir)/gst/dvdspu/gstdvdspu.h \ + $(top_srcdir)/gst/equalizer/gstiirequalizer.h \ $(top_srcdir)/gst/equalizer/gstiirequalizer3bands.h \ $(top_srcdir)/gst/equalizer/gstiirequalizer10bands.h \ $(top_srcdir)/gst/equalizer/gstiirequalizernbands.h \ @@ -138,6 +139,8 @@ EXTRA_HFILES = \ $(top_srcdir)/gst/rtpmanager/gstrtpsession.h \ $(top_srcdir)/gst/rtpmanager/gstrtpssrcdemux.h \ $(top_srcdir)/gst/sdp/gstsdpdemux.h \ + $(top_srcdir)/gst/selector/gstinputselector.h \ + $(top_srcdir)/gst/selector/gstoutputselector.h \ $(top_srcdir)/gst/spectrum/gstspectrum.h \ $(top_srcdir)/gst/speed/gstspeed.h \ $(top_srcdir)/gst/speexresample/gstspeexresample.h \ diff --git a/docs/plugins/gst-plugins-bad-plugins-docs.sgml b/docs/plugins/gst-plugins-bad-plugins-docs.sgml index 1f0df575..17eb3a5c 100644 --- a/docs/plugins/gst-plugins-bad-plugins-docs.sgml +++ b/docs/plugins/gst-plugins-bad-plugins-docs.sgml @@ -35,6 +35,7 @@ + @@ -45,6 +46,7 @@ + @@ -118,6 +120,7 @@ + @@ -127,7 +130,6 @@ - diff --git a/docs/plugins/gst-plugins-bad-plugins-sections.txt b/docs/plugins/gst-plugins-bad-plugins-sections.txt index 873b57ba..41671506 100644 --- a/docs/plugins/gst-plugins-bad-plugins-sections.txt +++ b/docs/plugins/gst-plugins-bad-plugins-sections.txt @@ -282,6 +282,20 @@ GST_TYPE_LPWSINC gst_lpwsinc_get_type +
+element-input-selector +input-selector +GstInputSelector + +GstInputSelectorClass +GST_INPUT_SELECTOR +GST_INPUT_SELECTOR_CLASS +GST_IS_INPUT_SELECTOR +GST_IS_INPUT_SELECTOR_CLASS +GST_TYPE_INPUT_SELECTOR +gst_input_selector_get_type +
+
element-ivorbisdec ivorbisdec @@ -412,6 +426,20 @@ GST_TYPE_NUV_DEMUX gst_nuv_demux_get_type
+
+element-output-selector +output-selector +GstOutputSelector + +GstOutputSelectorClass +GST_OUTPUT_SELECTOR +GST_OUTPUT_SELECTOR_CLASS +GST_IS_OUTPUT_SELECTOR +GST_IS_OUTPUT_SELECTOR_CLASS +GST_TYPE_OUTPUT_SELECTOR +gst_output_selector_get_type +
+
element-rganalysis rganalysis diff --git a/docs/plugins/gst-plugins-bad-plugins.args b/docs/plugins/gst-plugins-bad-plugins.args index 1cd87a4c..2f7edd5f 100644 --- a/docs/plugins/gst-plugins-bad-plugins.args +++ b/docs/plugins/gst-plugins-bad-plugins.args @@ -11,7 +11,7 @@ GstPitch::pitch gfloat -[0.1,10] +[0,1,10] rw Pitch Audio stream pitch. @@ -21,7 +21,7 @@ GstPitch::rate gfloat -[0.1,10] +[0,1,10] rw Rate Audio stream rate. @@ -31,7 +31,7 @@ GstPitch::tempo gfloat -[0.1,10] +[0,1,10] rw Tempo Audio stream tempo. @@ -430,7 +430,7 @@ GstXvidEnc::statsfile -gchararray +gchar* rw Statistics Filename @@ -530,7 +530,7 @@ GstNeonhttpSrc::location -gchararray +gchar* rw Location @@ -540,7 +540,7 @@ GstNeonhttpSrc::proxy -gchararray +gchar* rw Proxy @@ -570,7 +570,7 @@ GstNeonhttpSrc::iradio-genre -gchararray +gchar* r iradio-genre @@ -590,7 +590,7 @@ GstNeonhttpSrc::iradio-name -gchararray +gchar* r iradio-name @@ -600,7 +600,7 @@ GstNeonhttpSrc::iradio-url -gchararray +gchar* r iradio-url @@ -620,7 +620,7 @@ GstNeonhttpSrc::user-agent -gchararray +gchar* rw User-Agent @@ -630,7 +630,7 @@ GstTRM::proxy-address -gchararray +gchar* rw proxy address @@ -1030,7 +1030,7 @@ GstMMS::location -gchararray +gchar* rw location @@ -1190,7 +1190,7 @@ GstGLImageSink::display -gchararray +gchar* rw Display @@ -1480,7 +1480,7 @@ GstModPlug::songname -gchararray +gchar* r Songname @@ -1670,7 +1670,7 @@ GstJackAudioSink::server -gchararray +gchar* rw Server @@ -1780,7 +1780,7 @@ GstDvbSrc::pids -gchararray +gchar* w pids @@ -1870,7 +1870,7 @@ GstDvbSrc::polarity -gchararray +gchar* rw polarity @@ -1900,7 +1900,7 @@ GstMultiFileSink::location -gchararray +gchar* rw File Location @@ -1920,7 +1920,7 @@ GstMultiFileSrc::caps -GstCaps +GstCaps* rw Caps @@ -1940,7 +1940,7 @@ GstMultiFileSrc::location -gchararray +gchar* rw File Location @@ -1950,7 +1950,7 @@ GstRfbSrc::host -gchararray +gchar* rw Host to connect to @@ -1970,7 +1970,7 @@ GstRfbSrc::password -gchararray +gchar* w Password for authentication @@ -1980,7 +1980,7 @@ GstRfbSrc::version -gchararray +gchar* rw RFB protocol version @@ -17050,7 +17050,7 @@ GstCDAudio::device -gchararray +gchar* rw Device @@ -17220,7 +17220,7 @@ GstX264Enc::stats-file -gchararray +gchar* rw Stats File @@ -17580,7 +17580,7 @@ GstRealAudioDec::password -gchararray +gchar* rw Password @@ -17640,7 +17640,7 @@ GstRealAudioDec::ra14-4-names -gchararray +gchar* rw Names of 14_4 driver @@ -17650,7 +17650,7 @@ GstRealAudioDec::ra28-8-names -gchararray +gchar* rw Names of 28_8 driver @@ -17660,7 +17660,7 @@ GstRealAudioDec::raatrk-names -gchararray +gchar* rw Names of atrk driver @@ -17670,7 +17670,7 @@ GstRealAudioDec::racook-names -gchararray +gchar* rw Names of cook driver @@ -17680,7 +17680,7 @@ GstRealAudioDec::rasipr-names -gchararray +gchar* rw Names of sipr driver @@ -17690,7 +17690,7 @@ GstRealAudioDec::real-codecs-path -gchararray +gchar* rw Path where to search for RealPlayer codecs @@ -17730,7 +17730,7 @@ GstRealVideoDec::real-codecs-path -gchararray +gchar* rw Path where to search for RealPlayer codecs @@ -17740,7 +17740,7 @@ GstRealVideoDec::rv20-names -gchararray +gchar* rw Names of rv20 driver @@ -17750,7 +17750,7 @@ GstRealVideoDec::rv30-names -gchararray +gchar* rw Names of rv30 driver @@ -17760,7 +17760,7 @@ GstRealVideoDec::rv40-names -gchararray +gchar* rw Names of rv40 driver @@ -17830,7 +17830,7 @@ GstSFSrc::location -gchararray +gchar* rw File Location @@ -17850,7 +17850,7 @@ GstSFSink::location -gchararray +gchar* rw File Location @@ -17880,7 +17880,7 @@ GstSwitch::active-pad -gchararray +gchar* rw Active pad @@ -18210,7 +18210,7 @@ GstVCDSrc::device -gchararray +gchar* rw Device @@ -18270,7 +18270,7 @@ MpegTSParse::program-numbers -gchararray +gchar* rw Program Numbers @@ -18280,7 +18280,7 @@ GstAppSink::caps -GstCaps +GstCaps* rw Caps @@ -18350,7 +18350,7 @@ GstRtpSession::sdes-cname -gchararray +gchar* rw SDES CNAME @@ -18360,7 +18360,7 @@ GstRtpSession::sdes-email -gchararray +gchar* rw SDES EMAIL @@ -18370,7 +18370,7 @@ GstRtpSession::sdes-location -gchararray +gchar* rw SDES LOCATION @@ -18380,7 +18380,7 @@ GstRtpSession::sdes-name -gchararray +gchar* rw SDES NAME @@ -18390,7 +18390,7 @@ GstRtpSession::sdes-note -gchararray +gchar* rw SDES NOTE @@ -18400,7 +18400,7 @@ GstRtpSession::sdes-phone -gchararray +gchar* rw SDES PHONE @@ -18410,7 +18410,7 @@ GstRtpSession::sdes-tool -gchararray +gchar* rw SDES TOOL @@ -18460,7 +18460,7 @@ GstRtpBin::sdes-cname -gchararray +gchar* rw SDES CNAME @@ -18470,7 +18470,7 @@ GstRtpBin::sdes-email -gchararray +gchar* rw SDES EMAIL @@ -18480,7 +18480,7 @@ GstRtpBin::sdes-location -gchararray +gchar* rw SDES LOCATION @@ -18490,7 +18490,7 @@ GstRtpBin::sdes-name -gchararray +gchar* rw SDES NAME @@ -18500,7 +18500,7 @@ GstRtpBin::sdes-note -gchararray +gchar* rw SDES NOTE @@ -18510,7 +18510,7 @@ GstRtpBin::sdes-phone -gchararray +gchar* rw SDES PHONE @@ -18520,7 +18520,7 @@ GstRtpBin::sdes-tool -gchararray +gchar* rw SDES TOOL @@ -18680,7 +18680,7 @@ DvbBaseBin::polarity -gchararray +gchar* rw polarity @@ -18690,7 +18690,7 @@ DvbBaseBin::program-numbers -gchararray +gchar* rw Program Numbers @@ -19100,7 +19100,7 @@ GstFBDEVSink::device -gchararray +gchar* rw device @@ -19120,7 +19120,7 @@ Ivorbisfile::metadata -GstCaps +GstCaps* r Metadata @@ -19130,7 +19130,7 @@ Ivorbisfile::streaminfo -GstCaps +GstCaps* r stream @@ -19223,3 +19223,33 @@ 26 + +GstInputSelector::active-pad +gchar* + +rw +Active pad +Name of the currently active sink pad. +NULL + + + +GstOutputSelector::active-pad +gchar* + +rw +Active pad +Name of the currently active src pad. +NULL + + + +GstOutputSelector::resend-latest +gboolean + +rw +Resend latest buffer +Resend latest buffer after a switch to a new pad. +FALSE + + diff --git a/docs/plugins/gst-plugins-bad-plugins.hierarchy b/docs/plugins/gst-plugins-bad-plugins.hierarchy index 3e55df32..6212afb0 100644 --- a/docs/plugins/gst-plugins-bad-plugins.hierarchy +++ b/docs/plugins/gst-plugins-bad-plugins.hierarchy @@ -255,6 +255,29 @@ GObject ladspa-imp GstXvidEnc GstXvidDec + GstPitch + GstBaseTransform + GstAudioFilter + GstBPMDetect + GstStereo + GstSpectrum + GstLPWSinc + GstBPWSinc + GstIirEqualizer + GstIirEqualizerNBands + GstIirEqualizer3Bands + GstIirEqualizer10Bands + GstSpeexResample + GstVideoFilter + GstVideoAnalyse + GstVideoDetect + GstVideoMark + GstRgAnalysis + GstRgLimiter + GstVideoCrop + GstBayer2RGB + GstIIR + GstDeinterlace GstBaseSink GstSFSink GstVideoSink @@ -294,27 +317,6 @@ GObject GstAmrwbDec GstAmrwbParse GstAmrwbEnc - GstBaseTransform - GstSpeexResample - GstVideoFilter - GstVideoAnalyse - GstVideoDetect - GstVideoMark - GstRgAnalysis - GstRgLimiter - GstVideoCrop - GstAudioFilter - GstStereo - GstSpectrum - GstLPWSinc - GstBPWSinc - GstIirEqualizer - GstIirEqualizerNBands - GstIirEqualizer3Bands - GstIirEqualizer10Bands - GstBayer2RGB - GstIIR - GstDeinterlace MpegTSParse GstRawParse GstVideoParse @@ -341,6 +343,8 @@ GObject GstSpeed GstNsfDec GstDVDSpu + GstInputSelector + GstOutputSelector GstModPlug GstH264Parse GstFLVDemux diff --git a/docs/plugins/gst-plugins-bad-plugins.interfaces b/docs/plugins/gst-plugins-bad-plugins.interfaces index 946cd29a..efe88356 100644 --- a/docs/plugins/gst-plugins-bad-plugins.interfaces +++ b/docs/plugins/gst-plugins-bad-plugins.interfaces @@ -6,13 +6,13 @@ GstRtpClient GstChildProxy GstRgVolume GstChildProxy GstSDPDemux GstChildProxy GstMetadataMux GstTagSetter +GstIirEqualizer GstChildProxy +GstIirEqualizerNBands GstChildProxy +GstIirEqualizer3Bands GstChildProxy +GstIirEqualizer10Bands GstChildProxy GstSDLVideoSink GstImplementsInterface GstXOverlay GstNavigation GstGLImageSink GstImplementsInterface GstXOverlay GstNeonhttpSrc GstURIHandler GstMMS GstURIHandler GstVCDSrc GstURIHandler GstCDAudio GstURIHandler -GstIirEqualizer GstChildProxy -GstIirEqualizerNBands GstChildProxy -GstIirEqualizer3Bands GstChildProxy -GstIirEqualizer10Bands GstChildProxy diff --git a/docs/plugins/gst-plugins-bad-plugins.signals b/docs/plugins/gst-plugins-bad-plugins.signals index bd7d82a6..46576239 100644 --- a/docs/plugins/gst-plugins-bad-plugins.signals +++ b/docs/plugins/gst-plugins-bad-plugins.signals @@ -281,3 +281,20 @@ GstCDAudio *gstcdaudio gint arg1 + +GstInputSelector::block +gint64 +l +GstInputSelector *gstinputselector + + + +GstInputSelector::switch +void +l +GstInputSelector *gstinputselector +gchar *arg1 +gint64 arg2 +gint64 arg3 + + diff --git a/docs/plugins/inspect/plugin-metadata.xml b/docs/plugins/inspect/plugin-metadata.xml index 6a68f124..14da75d5 100644 --- a/docs/plugins/inspect/plugin-metadata.xml +++ b/docs/plugins/inspect/plugin-metadata.xml @@ -16,18 +16,18 @@ Send metadata tags (EXIF, IPTC and XMP) and remove metadata chunks from stream Edgard Lima <edgard.lima@indt.org.br> - - src - source - always -
image/jpeg, tags-extracted=(boolean)true; image/png, tags-extracted=(boolean)true
- sink sink always
image/jpeg, tags-extracted=(boolean)false; image/png, tags-extracted=(boolean)false
 + + src + source + always +
image/jpeg, tags-extracted=(boolean)true; image/png, tags-extracted=(boolean)true
+ @@ -37,18 +37,18 @@ Write metadata (EXIF, IPTC and XMP) into a image stream Edgard Lima <edgard.lima@indt.org.br> - - src - source - always -
image/jpeg; image/png
- sink sink always
image/jpeg, tags-extracted=(boolean)true; image/png, tags-extracted=(boolean)true
 + + src + source + always +
image/jpeg; image/png
+ diff --git a/docs/plugins/inspect/plugin-selector.xml b/docs/plugins/inspect/plugin-selector.xml new file mode 100644 index 00000000..38f76058 --- /dev/null +++ b/docs/plugins/inspect/plugin-selector.xml @@ -0,0 +1,55 @@ + + selector + input/output stream selector elements + ../../gst/selector/.libs/libgstselector.so + libgstselector.so + 0.10.5.1 + LGPL + gst-plugins-bad + GStreamer Bad Plug-ins CVS/prerelease + Unknown package origin + + + input-selector + Input selector + Generic + N-to-1 input stream selectoring + Julien Moutte <julien@moutte.net>012Ronald S. Bultje <rbultje@ronald.bitfreak.net>012Jan Schmidt <thaytan@mad.scientist.com>012Wim Taymans <wim.taymans@gmail.com> + + + src + source + always +
ANY
+ + + sink%d + sink + request +
ANY
+ + + + + output-selector + Output selector + Generic + 1-to-N output stream selectoring + Stefan Kost <stefan.kost@nokia.com> + + + src%d + source + request +
ANY
+ + + sink + sink + always +
ANY
+ + + + + \ No newline at end of file diff --git a/docs/plugins/inspect/plugin-soundtouch.xml b/docs/plugins/inspect/plugin-soundtouch.xml index 9bfcd209..cd6ecbbb 100644 --- a/docs/plugins/inspect/plugin-soundtouch.xml +++ b/docs/plugins/inspect/plugin-soundtouch.xml @@ -1,14 +1,35 @@ soundtouch - Audio Pitch Controller - ../../ext/soundtouch/.libs/libgstpitch.so - libgstpitch.so + Audio Pitch Controller & BPM Detection + ../../ext/soundtouch/.libs/libgstsoundtouch.so + libgstsoundtouch.so 0.10.5.1 LGPL gst-plugins-bad GStreamer Bad Plug-ins CVS/prerelease Unknown package origin + + bpmdetect + BPM Detector + Filter/Analyzer/Audio + Detect the BPM of an audio stream + Sebastian Dr303266ge <slomo@circular-chaos.org> + + + sink + sink + always +
audio/x-raw-float, width=(int)32, endianness=(int)1234, rate=(int)[ 8000, 2147483647 ], channels=(int)[ 1, 2 ]
+ + + src + source + always +
audio/x-raw-float, width=(int)32, endianness=(int)1234, rate=(int)[ 8000, 2147483647 ], channels=(int)[ 1, 2 ]
+ + + pitch Pitch controller @@ -17,16 +38,16 @@ Wouter Paesen <wouter@blue-gate.be> - src - source + sink + sink always -
audio/x-raw-float, rate=(int)[ 8000, 48000 ], channels=(int)[ 1, 2 ], endianness=(int)1234, width=(int)32, buffer-frames=(int)[ 0, 2147483647 ]
+
audio/x-raw-float, rate=(int)[ 8000, 2147483647 ], channels=(int)[ 1, 2 ], endianness=(int)1234, width=(int)32
 - sink - sink + src + source always -
audio/x-raw-float, rate=(int)[ 8000, 48000 ], channels=(int)[ 1, 2 ], endianness=(int)1234, width=(int)32, buffer-frames=(int)[ 0, 2147483647 ]
+
audio/x-raw-float, rate=(int)[ 8000, 2147483647 ], channels=(int)[ 1, 2 ], endianness=(int)1234, width=(int)32
 diff --git a/docs/plugins/inspect/plugin-switch.xml b/docs/plugins/inspect/plugin-switch.xml deleted file mode 100644 index 64c1cf23..00000000 --- a/docs/plugins/inspect/plugin-switch.xml +++ /dev/null @@ -1,34 +0,0 @@ - - switch - N-to-1 input switching - ../../gst/switch/.libs/libgstswitch.so - libgstswitch.so - 0.10.5.1 - LGPL - gst-plugins-bad - GStreamer Bad Plug-ins CVS/prerelease - Unknown package origin - - - switch - StreamSelector - Generic - N-to-1 input stream_selectoring - Julien Moutte <julien@moutte.net>012Ronald S. Bultje <rbultje@ronald.bitfreak.net>012Jan Schmidt <thaytan@mad.scientist.com>012Wim Taymans <wim.taymans@gmail.com> - - - src - source - always -
ANY
- - - sink%d - sink - request -
ANY
- - - - - \ No newline at end of file -- cgit v1.2.1