From: Tim-Philipp Müller Date: Thu, 30 Dec 2010 01:14:29 +0000 (+0000) Subject: valve: move valve element/plugin to core X-Git-Tag: 1.19.3~507^2~16062^2~226 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=222be5f0e9d13d031ff9b4a7efdaec70bd6c4735;p=platform%2Fupstream%2Fgstreamer.git valve: move valve element/plugin to core https://bugzilla.gnome.org/show_bug.cgi?id=630808 --- diff --git a/Makefile.am b/Makefile.am index 93388d7..dad9686 100644 --- a/Makefile.am +++ b/Makefile.am @@ -49,12 +49,14 @@ CRUFT_FILES = \ $(top_builddir)/gst/aacparse/.libs/*.{so,dll,DLL,dylib} \ $(top_builddir)/gst/amrparse/.libs/*.{so,dll,DLL,dylib} \ $(top_builddir)/gst/flacparse/.libs/*.{so,dll,DLL,dylib} \ - $(top_builddir)/gst/shapewipe/.libs/*.{so,dll,DLL,dylib} \ $(top_builddir)/gst/imagefreeze/.libs/*.{so,dll,DLL,dylib} \ + $(top_builddir)/gst/shapewipe/.libs/*.{so,dll,DLL,dylib} \ + $(top_builddir)/gst/valve/.libs/*.{so,dll,DLL,dylib} \ $(top_builddir)/sys/oss4/.libs/*.{so,dll,DLL,dylib} \ $(top_builddir)/tests/check/elements/autocolorspace \ $(top_builddir)/tests/check/elements/capssetter \ $(top_builddir)/tests/check/elements/imagefreeze \ + $(top_builddir)/tests/check/elements/valve \ $(top_builddir)/tests/check/pipelines/metadata \ $(top_builddir)/tests/icles/test-oss4 @@ -64,6 +66,7 @@ CRUFT_DIRS = \ $(top_srcdir)/gst/flacparse \ $(top_srcdir)/gst/imagefreeze \ $(top_srcdir)/gst/shapewipe \ + $(top_srcdir)/gst/valve \ $(top_srcdir)/tests/examples/shapewipe \ $(top_srcdir)/ext/alsaspdif \ $(top_srcdir)/ext/ivorbis \ diff --git a/configure.ac b/configure.ac index 25edb91..cde1da9 100644 --- a/configure.ac +++ b/configure.ac @@ -50,8 +50,8 @@ AC_LIBTOOL_WIN32_DLL AM_PROG_LIBTOOL dnl *** required versions of GStreamer stuff *** -GST_REQ=0.10.31 -GSTPB_REQ=0.10.31 +GST_REQ=0.10.31.1 +GSTPB_REQ=0.10.31.1 dnl *** autotools stuff **** @@ -178,7 +178,7 @@ AC_CHECK_FUNC(socket,,[AC_CHECK_LIB(socket,socket)]) AC_CHECK_FUNC(gethostbyname,,[AC_CHECK_LIB(nsl,gethostbyname)]) dnl GLib is required -AG_GST_GLIB_CHECK([2.20]) +AG_GST_GLIB_CHECK([2.22]) dnl checks for gstreamer dnl uninstalled is selected preferentially -- see pkg-config(1) @@ -343,7 +343,6 @@ AG_GST_CHECK_PLUGIN(speed) AG_GST_CHECK_PLUGIN(subenc) AG_GST_CHECK_PLUGIN(stereo) AG_GST_CHECK_PLUGIN(tta) -AG_GST_CHECK_PLUGIN(valve) AG_GST_CHECK_PLUGIN(videomaxrate) AG_GST_CHECK_PLUGIN(videomeasure) AG_GST_CHECK_PLUGIN(videosignal) @@ -1773,7 +1772,6 @@ gst/speed/Makefile gst/subenc/Makefile gst/stereo/Makefile gst/tta/Makefile -gst/valve/Makefile gst/videomaxrate/Makefile gst/videomeasure/Makefile gst/videosignal/Makefile diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am index ff940df..478b90e 100644 --- a/docs/plugins/Makefile.am +++ b/docs/plugins/Makefile.am @@ -203,7 +203,6 @@ EXTRA_HFILES = \ $(top_srcdir)/gst/videosignal/gstvideoanalyse.h \ $(top_srcdir)/gst/videosignal/gstvideodetect.h \ $(top_srcdir)/gst/videosignal/gstvideomark.h \ - $(top_srcdir)/gst/valve/gstvalve.h \ $(top_srcdir)/sys/directdraw/gstdirectdrawsink.h \ $(top_srcdir)/sys/dvb/gstdvbsrc.h \ $(top_srcdir)/sys/shm/gstshmsink.h \ diff --git a/docs/plugins/gst-plugins-bad-plugins-docs.sgml b/docs/plugins/gst-plugins-bad-plugins-docs.sgml index 575afc1..cb2ff1a 100644 --- a/docs/plugins/gst-plugins-bad-plugins-docs.sgml +++ b/docs/plugins/gst-plugins-bad-plugins-docs.sgml @@ -122,7 +122,6 @@ - @@ -215,7 +214,6 @@ - diff --git a/docs/plugins/gst-plugins-bad-plugins-sections.txt b/docs/plugins/gst-plugins-bad-plugins-sections.txt index fdfb781..8f26b09 100644 --- a/docs/plugins/gst-plugins-bad-plugins-sections.txt +++ b/docs/plugins/gst-plugins-bad-plugins-sections.txt @@ -1603,21 +1603,6 @@ gst_twirl_plugin_init
-element-valve -valve -GstValve - -GstValveClass -GstValvePrivate -gst_valve_get_type -GST_IS_VALVE -GST_IS_VALVE_CLASS -GST_TYPE_VALVE -GST_VALVE -GST_VALVE_CLASS -
- -
element-videoanalyse videoanalyse GstVideoAnalyse diff --git a/docs/plugins/gst-plugins-bad-plugins.args b/docs/plugins/gst-plugins-bad-plugins.args index 4717bb9..73c886c 100644 --- a/docs/plugins/gst-plugins-bad-plugins.args +++ b/docs/plugins/gst-plugins-bad-plugins.args @@ -41,7 +41,7 @@ GstXvidEnc::averaging-period gint -[-1,100] +[G_MAXULONG,100] rw Averaging Period [CBR] Number of frames for which XviD averages bitrate. @@ -91,7 +91,7 @@ GstXvidEnc::buffer gint ->= -1 +>= G_MAXULONG rw Buffer Size [CBR] Size of the video buffers. @@ -121,7 +121,7 @@ GstXvidEnc::container-frame-overhead gint -[-1,100] +[G_MAXULONG,100] rw Container Frame Overhead [PASS2] Average container overhead per frame. @@ -151,7 +151,7 @@ GstXvidEnc::flow-control-strength gint -[-1,100] +[G_MAXULONG,100] rw Flow Control Strength [PASS2] Overflow control strength per frame. @@ -211,7 +211,7 @@ GstXvidEnc::keyframe-reduction gint -[-1,100] +[G_MAXULONG,100] rw Keyframe Reduction [PASS2] Keyframe size reduction in % of those within threshold. @@ -221,7 +221,7 @@ GstXvidEnc::keyframe-threshold gint -[-1,100] +[G_MAXULONG,100] rw Keyframe Threshold [PASS2] Distance between keyframes not to be subject to reduction. @@ -281,7 +281,7 @@ GstXvidEnc::max-overflow-degradation gint -[-1,100] +[G_MAXULONG,100] rw Max Overflow Degradation [PASS2] Amount in % that flow control can decrease frame size compared to ideal curve. @@ -291,7 +291,7 @@ GstXvidEnc::max-overflow-improvement gint -[-1,100] +[G_MAXULONG,100] rw Max Overflow Improvement [PASS2] Amount in % that flow control can increase frame size compared to ideal curve. @@ -421,7 +421,7 @@ GstXvidEnc::reaction-delay-factor gint -[-1,100] +[G_MAXULONG,100] rw Reaction Delay Factor [CBR] Reaction delay factor. @@ -1731,7 +1731,7 @@ GstDvbSrc::diseqc-source gint -[-1,7] +[G_MAXULONG,7] rw diseqc source DISEqC selected source (-1 disabled) (DVB-S). @@ -17175,7 +17175,7 @@ rw Path where to search for RealPlayer codecs Path where to search for RealPlayer codecs. -"/usr/lib/win32:/usr/lib/codecs:/usr/local/RealPlayer/codecs:/usr/local/lib/win32:/usr/local/lib/codecs" +"/usr/lib64/win32:/usr/lib64/codecs:/usr/local/lib64/win32:/usr/local/lib64/codecs" @@ -17215,7 +17215,7 @@ rw Path where to search for RealPlayer codecs Path where to search for RealPlayer codecs. -"/usr/lib/win32:/usr/lib/codecs:/usr/local/RealPlayer/codecs:/usr/local/lib/win32:/usr/local/lib/codecs" +"/usr/lib64/win32:/usr/lib64/codecs:/usr/local/lib64/win32:/usr/local/lib64/codecs" @@ -17871,7 +17871,7 @@ DvbBaseBin::diseqc-source gint -[-1,7] +[G_MAXULONG,7] rw diseqc source DISEqC selected source (-1 disabled) (DVB-S). @@ -18019,6 +18019,16 @@ +GstSDPDemux::redirect +gboolean + +rwx +Redirect +Sends a redirection message instead of using a custom session element. +TRUE + + + GstSpeexResample::quality gint [0,10] @@ -18099,6 +18109,16 @@ +GstAudioParse::channel-positions +GValueArray* + +rw +Channel positions +Channel positions used on the output. + + + + GstVideoParse::alpha-mask gint @@ -21916,11 +21936,11 @@ GstCeltEnc::bitrate gint -[10,320] +[10000,320000] rw Encoding Bit-rate -Specify an encoding bit-rate (in Kbps). -64 +Specify an encoding bit-rate (in bps). +64000 @@ -21956,11 +21976,11 @@ GstCeltEnc::max-bitrate gint -[10,320] +[10000,320000] rw Maximum Encoding Bit-rate -Specify a maximum encoding bit rate (in Kbps) for variable bit rate encoding. -64 +Specify a maximum encoding bit rate (in bps) for variable bit rate encoding. +64000 @@ -22066,7 +22086,7 @@ GstDCCPClientSrc::sockfd gint ->= -1 +>= G_MAXULONG rw Socket fd The socket file descriptor. @@ -22106,7 +22126,7 @@ GstDCCPServerSink::sockfd gint ->= -1 +>= G_MAXULONG rw Socket fd The client socket file descriptor. @@ -22166,7 +22186,7 @@ GstDCCPClientSink::sockfd gint ->= -1 +>= G_MAXULONG rw Socket fd The socket file descriptor. @@ -22226,7 +22246,7 @@ GstDCCPServerSrc::sockfd gint ->= -1 +>= G_MAXULONG rw Socket fd The client socket file descriptor. @@ -22286,7 +22306,7 @@ GstMpegTSDemux::program-number gint ->= -1 +>= G_MAXULONG rw Program Number Program number to demux for (-1 to ignore). @@ -22346,7 +22366,7 @@ GstPcapParse::dst-port gint -[-1,65535] +[G_MAXULONG,65535] rw Destination port Destination port to restrict to. @@ -22366,7 +22386,7 @@ GstPcapParse::src-port gint -[-1,65535] +[G_MAXULONG,65535] rw Source port Source port to restrict to. @@ -22374,6 +22394,16 @@ +GstPcapParse::caps +GstCaps* + +rw +Caps +The caps of the source pad. + + + + MpegTsMux::m2ts-mode gboolean @@ -22524,6 +22554,36 @@ +GstMJ2Mux::fragment-duration +guint + +rwx +Fragment duration +Fragment durations in ms (produce a fragmented file if > 0). +0 + + + +GstMJ2Mux::streamable +gboolean + +rwx +Streamable +If set to true, the output should be as if it is to be streamed and hence no indexes written or duration written. +FALSE + + + +GstMJ2Mux::trak-timescale +guint + +rwx +Track timescale +Timescale to use for the tracks (units per second, 0 is automatic). +0 + + + GstGPPMux::faststart gboolean @@ -22584,6 +22644,36 @@ +GstGPPMux::fragment-duration +guint + +rwx +Fragment duration +Fragment durations in ms (produce a fragmented file if > 0). +0 + + + +GstGPPMux::streamable +gboolean + +rwx +Streamable +If set to true, the output should be as if it is to be streamed and hence no indexes written or duration written. +FALSE + + + +GstGPPMux::trak-timescale +guint + +rwx +Track timescale +Timescale to use for the tracks (units per second, 0 is automatic). +0 + + + GstMP4Mux::faststart gboolean @@ -22644,6 +22734,36 @@ +GstMP4Mux::fragment-duration +guint + +rwx +Fragment duration +Fragment durations in ms (produce a fragmented file if > 0). +0 + + + +GstMP4Mux::streamable +gboolean + +rwx +Streamable +If set to true, the output should be as if it is to be streamed and hence no indexes written or duration written. +FALSE + + + +GstMP4Mux::trak-timescale +guint + +rwx +Track timescale +Timescale to use for the tracks (units per second, 0 is automatic). +0 + + + GstQTMux::faststart gboolean @@ -22704,6 +22824,36 @@ +GstQTMux::fragment-duration +guint + +rwx +Fragment duration +Fragment durations in ms (produce a fragmented file if > 0). +0 + + + +GstQTMux::streamable +gboolean + +rwx +Streamable +If set to true, the output should be as if it is to be streamed and hence no indexes written or duration written. +FALSE + + + +GstQTMux::trak-timescale +guint + +rwx +Track timescale +Timescale to use for the tracks (units per second, 0 is automatic). +0 + + + GstAudioresample::filter-length gint >= 0 @@ -22895,12 +23045,12 @@ GstCameraBin::zoom -gint -[100,1000] +gfloat +[1,10] rw Zoom -The zoom. 100 for 1x, 200 for 2x and so on. -100 +The zoom. 1.0 for 1x, 2.0 for 2x and so on. +1 @@ -23104,6 +23254,36 @@ +GstCameraBin::idle +gboolean + +r +Indicates if data is being processed (recording/capturing/saving) +Indicates if data is being processed (recording/capturing/saving). +TRUE + + + +GstCameraBin::preview-source-filter +GstElement* + +rw +preview source filter element +Optional preview source filter GStreamer element. + + + + +GstCameraBin::ready-for-capture +gboolean + +r +Indicates if preparing a new capture is possible +Indicates if preparing a new capture is possible. +TRUE + + + GstDTMFSrc::interval guint [10,50] @@ -23166,7 +23346,7 @@ GstRTPDTMFSrc::seqnum-offset gint ->= -1 +>= G_MAXULONG rw Sequence number Offset Offset to add to all outgoing seqnum (-1 = random). @@ -23196,7 +23376,7 @@ GstRTPDTMFSrc::timestamp-offset gint ->= -1 +>= G_MAXULONG rw Timestamp Offset Offset to add to all outgoing timestamps (-1 = random). @@ -23246,7 +23426,7 @@ GstRTPMux::seqnum-offset gint ->= -1 +>= G_MAXULONG rw Sequence number Offset Offset to add to all outgoing seqnum (-1 = random). @@ -23266,7 +23446,7 @@ GstRTPMux::timestamp-offset gint ->= -1 +>= G_MAXULONG rw Timestamp Offset Offset to add to all outgoing timestamps (-1 = random). @@ -26410,7 +26590,7 @@ rw physics water density: from 1 to 4. -8.20075e-304 +0 @@ -26450,7 +26630,7 @@ rw splash make a big splash in the center. -0 +7.7486e-304 @@ -26460,7 +26640,7 @@ rw splash make a big splash in the center. -4.77773e-299 +0 @@ -26490,7 +26670,7 @@ rw ratiox x-ratio. -8.0843e+44 +8.55111e-317 @@ -26500,7 +26680,7 @@ rw ratioy y-ratio. -9.3207e+68 +2.28459e-26 @@ -26510,7 +26690,7 @@ rw DelayTime the delay time. -1.18576e-322 +0 @@ -26560,7 +26740,7 @@ rw Color-R the color of the image. -0 +2.49965e-38 @@ -26890,7 +27070,7 @@ rw lredscale multiplier for downscaling non-edge brightness. -0 +3.40216e-111 @@ -26910,7 +27090,7 @@ rw lupscale multiplier for upscaling edge brightness. -1.34037e-317 +7.54985e-96 @@ -27080,7 +27260,7 @@ rw blend blend factor. -7.75038e-304 +-5.83169e+303 @@ -27090,7 +27270,7 @@ rw fader the fader position. -5.12056e+199 +1.20296e-314 @@ -27270,7 +27450,7 @@ rw HSync the hsync offset. -2.07558e-316 +2.98023e-08 @@ -43118,12 +43298,22 @@ gboolean rw -mesage +message Post a barcode message for each detected code. TRUE +GstZBar::cache +gboolean + +rw +cache +Enable or disable the inter-image result cache. +FALSE + + + GstQTMoovRecover::broken-input gchar* @@ -45754,6 +45944,36 @@ +GstPhotography::image-preview-supported-caps +GstCaps* + +r +Image preview supported caps +Caps describing supported image preview formats. + + + + +GstPhotography::noise-reduction +GstPhotographyNoiseReduction + +rw +Noise Reduction settings +Which noise reduction modes are enabled (0 = disabled). + + + + +GstPhotography::zoom +gfloat +[1,10] +rw +Zoom property +How much the resulted image will be zoomed. +1 + + + GstWaterRipple::amplitude gdouble @@ -46114,6 +46334,36 @@ +GstSolarize::end +guint +<= 256 +rw +End +End parameter. +185 + + + +GstSolarize::start +guint +<= 256 +rw +Start +Start parameter. +50 + + + +GstSolarize::threshold +guint +<= 256 +rw +Threshold +Threshold parameter. +127 + + + GstExclusion::silent gboolean @@ -46124,6 +46374,16 @@ +GstExclusion::factor +guint +<= 175 +rw +Factor +Exclusion factor parameter. +175 + + + GstDodge::silent gboolean @@ -46144,6 +46404,16 @@ +GstDilate::erode +gboolean + +rw +Erode +Erode parameter. +FALSE + + + GstChromium::silent gboolean @@ -46154,6 +46424,26 @@ +GstChromium::edge-a +guint +<= 256 +rw +Edge A +First edge parameter. +200 + + + +GstChromium::edge-b +guint +<= 256 +rw +Edge B +Second edge parameter. +1 + + + GstBurn::silent gboolean @@ -46164,6 +46454,16 @@ +GstBurn::adjustment +guint +<= 256 +rw +Adjustment +Adjustment parameter. +175 + + + GaussBlur::sigma gdouble [-20,20] @@ -46304,6 +46604,36 @@ +GstInterlace::allow-rff +gboolean + +rw +Allow Repeat-First-Field flags +Allow generation of buffers with RFF flag set, i.e., duration of 3 fields. +FALSE + + + +GstInterlace::field-pattern +GstInterlacePattern + +rw +Field pattern +The output field pattern. +2:3 + + + +GstInterlace::pattern-offset +guint +<= 12 +rw +Pattern offset +The initial field pattern offset. Counts from 0. +0 + + + Gsttextwrite::colorB gint [0,255] @@ -46484,6 +46814,56 @@ +Gstfacedetect::flags +GstOpencvFaceDetectFlags + +rw +Flags +Flags to cvHaarDetectObjects. + + + + +Gstfacedetect::min-neighbors +gint +>= 0 +rw +Mininum neighbors +Minimum number (minus 1) of neighbor rectangles that makes up an object. +3 + + + +Gstfacedetect::min-size-height +gint +>= 0 +rw +Minimum size height +Minimum window height size. +0 + + + +Gstfacedetect::min-size-width +gint +>= 0 +rw +Minimum size width +Minimum window width size. +0 + + + +Gstfacedetect::scale-factor +gdouble +[1.1,10] +rw +Scale factor +Factor by which the windows is scaled after each scan. +1.1 + + + Gstfaceblur::profile gchar* @@ -46546,7 +46926,7 @@ GstCvSobel::x-order gint ->= -1 +>= G_MAXULONG rw x order Order of the derivative x. @@ -46556,7 +46936,7 @@ GstCvSobel::y-order gint ->= -1 +>= G_MAXULONG rw y order Order of the derivative y. @@ -46623,3 +47003,263 @@ 3 + +GstRotate::angle +gdouble + +rw +angle +Angle at which the arc starts in radians. +0 + + + +GstJP2kDecimator::max-decomposition-levels +gint +[G_MAXULONG,32] +rw +Maximum Number of Decomposition Levels +Maximum number of decomposition levels to keep (-1 == all). +-1 + + + +GstJP2kDecimator::max-layers +gint +[0,65535] +rw +Maximum Number of Layers +Maximum number of layers to keep (0 == all). +0 + + + +GstISMLMux::faststart +gboolean + +rw +Format file to faststart +If the file should be formated for faststart (headers first). . +FALSE + + + +GstISMLMux::faststart-file +gchar* + +rwx +File to use for storing buffers +File that will be used temporarily to store data from the stream when creating a faststart file. If null a filepath will be created automatically. +NULL + + + +GstISMLMux::fragment-duration +guint + +rwx +Fragment duration +Fragment durations in ms (produce a fragmented file if > 0). +2000 + + + +GstISMLMux::large-file +gboolean + +rw +Support for large files +Uses 64bits to some fields instead of 32bits, providing support for large files. +FALSE + + + +GstISMLMux::moov-recovery-file +gchar* + +rwx +File to store data for posterior moov atom recovery +File to be used to store data for moov atom making movie file recovery possible in case of a crash during muxing. Null for disabled. (Experimental). +NULL + + + +GstISMLMux::movie-timescale +guint +>= 1 +rwx +Movie timescale +Timescale to use in the movie (units per second). +1000 + + + +GstISMLMux::presentation-time +gboolean + +rwx +Include presentation-time info +Calculate and include presentation/composition time (in addition to decoding time) (use with caution). +FALSE + + + +GstISMLMux::streamable +gboolean + +rwx +Streamable +If set to true, the output should be as if it is to be streamed and hence no indexes written or duration written. +FALSE + + + +GstISMLMux::trak-timescale +guint + +rwx +Track timescale +Timescale to use for the tracks (units per second, 0 is automatic). +0 + + + +GstChopMyData::max-size +gint +>= 1 +rw +max-size +Maximum size of outgoing buffers. +4096 + + + +GstChopMyData::min-size +gint +>= 1 +rw +max-size +Minimum size of outgoing buffers. +1 + + + +GstChopMyData::step-size +gint +>= 1 +rw +step-size +Step increment for random buffer sizes. +4096 + + + +GstChromaHold::target-b +guint +<= 255 +rw +Target Blue +The Blue target. +0 + + + +GstChromaHold::target-g +guint +<= 255 +rw +Target Green +The Green target. +0 + + + +GstChromaHold::target-r +guint +<= 255 +rw +Target Red +The Red target. +255 + + + +GstChromaHold::tolerance +guint +<= 180 +rw +Tolerance +Tolerance for the target color. +30 + + + +GstDVBSubOverlay::enable +gboolean + +rw +Enable +Enable rendering of subtitles. +TRUE + + + +GstDVBSubOverlay::max-page-timeout +gint +>= 0 +rw +max-page-timeout +Limit maximum display time of a subtitle page (0 - disabled, value in seconds). +0 + + + +GstRsvgOverlay::data +gchar* + +w +data +SVG data. +"" + + + +GstRsvgOverlay::fit-to-frame +gboolean + +rw +fit to frame +Fit the SVG to fill the whole frame. +TRUE + + + +GstRsvgOverlay::location +gchar* + +w +location +SVG file location. +"" + + + +GstRsvgOverlay::x +gint +>= 0 +rw +x offset +Specify an x offset. +0 + + + +GstRsvgOverlay::y +gint +>= 0 +rw +y offset +Specify a y offset. +0 + + diff --git a/docs/plugins/gst-plugins-bad-plugins.hierarchy b/docs/plugins/gst-plugins-bad-plugins.hierarchy index c8888c2..d377a64 100644 --- a/docs/plugins/gst-plugins-bad-plugins.hierarchy +++ b/docs/plugins/gst-plugins-bad-plugins.hierarchy @@ -3,11 +3,14 @@ GObject GstObject GstBus GstClock + GstSystemClock + GstAudioClock GstElement ADPCMDec ADPCMEnc GstAiffMux GstAiffParse + GstAmrWbEnc GstAsfMux GstAsfParse GstAssRender @@ -15,37 +18,58 @@ GObject GstAacParse GstAc3Parse GstAmrParse + GstDcaParse GstFlacParse - GstBaseMetadata - GstMetadataDemux - GstMetadataMux + GstMpegAudioParse GstBaseRTPDepayload GstRtpDTMFDepay GstBaseRTPPayload GstRtpAsfPay GstBaseSink - AlsaSPDIFSink + GstBaseAudioSink + GstAudioSink + GstApExSink + GstNasSink + GstSDLAudioSink + GstJackAudioSink GstChecksumSink GstDCCPClientSink GstDCCPServerSink GstFBDEVSink + GstSFSink GstShmSink GstVideoSink GstDfbVideoSink + GstSDLVideoSink + VdpSink GstBaseSrc GstDTMFSrc GstDataURISrc GstPushSrc + GstBaseAudioSrc + GstJackAudioSrc GstDCCPClientSrc GstDCCPServerSrc + GstDc1394 GstDvbSrc GstMMS + GstMythtvSrc + GstNeonhttpSrc GstRfbSrc GstShmSrc GstVCDSrc + frei0r-src-ising0r + frei0r-src-lissajous0r + frei0r-src-nois0r + frei0r-src-onecol0r + frei0r-src-partik0l + frei0r-src-plasma GstRTPDTMFSrc + GstSFSrc GstBaseTransform GstAudioFilter + GstBPMDetect + GstOFA GstStereo GstBayer2RGB GstCogScale @@ -62,8 +86,10 @@ GObject GstVideoFilter GaussBlur GstBurn + GstChromaHold GstChromium GstColorEffects + GstCsp GstDilate GstDodge GstExclusion @@ -82,6 +108,7 @@ GObject GstFisheye GstMarble GstMirror + GstRotate GstSquare GstOpencvVideoFilter GstCvDilateErode @@ -92,20 +119,97 @@ GObject GstCvSmooth GstCvSobel Gstfacedetect + GstRsvgOverlay GstSolarize GstVideoAnalyse GstVideoDetect GstVideoMark + GstZBar + frei0r-filter-3-point-color-balance + frei0r-filter-3dflippo + frei0r-filter-b + frei0r-filter-baltan + frei0r-filter-bluescreen0r + frei0r-filter-brightness + frei0r-filter-bw0r + frei0r-filter-cartoon + frei0r-filter-color-distance + frei0r-filter-contrast0r + frei0r-filter-curves + frei0r-filter-dealygrab + frei0r-filter-delay0r + frei0r-filter-distort0r + frei0r-filter-edgeglow + frei0r-filter-equaliz0r + frei0r-filter-flippo + frei0r-filter-g + frei0r-filter-gamma + frei0r-filter-glow + frei0r-filter-hueshift0r + frei0r-filter-invert0r + frei0r-filter-k-means-clustering + frei0r-filter-lens-correction + frei0r-filter-letterb0xed + frei0r-filter-levels + frei0r-filter-luminance + frei0r-filter-mask0mate + frei0r-filter-nervous + frei0r-filter-nosync0r + frei0r-filter-perspective + frei0r-filter-pixeliz0r + frei0r-filter-primaries + frei0r-filter-r + frei0r-filter-rgb-parade + frei0r-filter-saturat0r + frei0r-filter-scale0tilt + frei0r-filter-scanline0r + frei0r-filter-sobel + frei0r-filter-squareblur + frei0r-filter-tehroxx0r + frei0r-filter-threelay0r + frei0r-filter-threshold0r + frei0r-filter-tint0r + frei0r-filter-transparency + frei0r-filter-twolay0r + frei0r-filter-vectorscope + frei0r-filter-vertigo + frei0r-filter-water + frei0r-filter-white-balance GstVideoMaxRate + GstBaseVideoCodec + GstBaseVideoDecoder + GstSchroDec + GstVP8Dec + GstBaseVideoEncoder + GstDiracEnc + GstSchroEnc + GstVP8Enc + GstBaseVideoParse + GstSchroParse GstBin DvbBaseBin GstAutoConvert + GstAutoVideoConvert GstFPSDisplaySink + GstGSettingsSwitchSink + GstGSettingsAudioSink + GstGSettingsVideoSink + GstGSettingsSwitchSrc + GstGSettingsAudioSrc + GstGSettingsVideoSrc GstPipeline GstCameraBin GstQTMoovRecover GstSDPDemux + RsnDvdBin + GstBz2dec + GstBz2enc + GstCDAudio GstCDXAParse + GstCeltDec + GstCeltEnc + GstChopMyData + GstDVBSubOverlay GstDVDSpu GstDtsDec GstFaac @@ -113,34 +217,46 @@ GObject GstFestival GstFreeze GstGPPMux + GstGSMDec + GstGSMEnc GstH264Parse + GstISMLMux GstId3BaseMux GstId3Mux GstInputSelector GstInterlace GstInvtelecine GstIvfParse + GstJP2kDecimator GstJifMux GstJpegParse GstKateDec GstKateEnc GstKateParse GstKateTag + GstKateTiger GstLiveAdder GstMJ2Mux GstMP4Mux GstMSE GstMXFDemux GstMXFMux + GstMimDec + GstMimEnc + GstModPlug + GstMpeg2enc GstMpeg4VParse GstMpegPSDemux GstMpegTSDemux + GstMplex + GstMusepackDec GstMveDemux GstMveMux GstNsfDec GstNuvDemux GstOutputSelector GstPcapParse + GstPitch GstPnmdec GstPnmenc GstQTMux @@ -156,18 +272,170 @@ GObject GstSegmentClip GstAudioSegmentClip GstVideoSegmentClip + GstSignalProcessor + ladspa-Chorus1 + ladspa-Chorus2 + ladspa-G2reverb + ladspa-Mvchpf-1 + ladspa-Mvclpf-1 + ladspa-Mvclpf-2 + ladspa-Mvclpf-3 + ladspa-Mvclpf-4 + ladspa-Phaser1 + ladspa-Phaser1+LFO + ladspa-TripleChorus + ladspa-alias + ladspa-allpass-c + ladspa-allpass-l + ladspa-allpass-n + ladspa-amPitchshift + ladspa-amp + ladspa-amp-mono + ladspa-amp-stereo + ladspa-analogueOsc + ladspa-artificialLatency + ladspa-autoPhaser + ladspa-bandpass-a-iir + ladspa-bandpass-iir + ladspa-bodeShifter + ladspa-bodeShifterCV + ladspa-butthigh-iir + ladspa-buttlow-iir + ladspa-bwxover-iir + ladspa-chebstortion + ladspa-comb + ladspa-comb-c + ladspa-comb-l + ladspa-comb-n + ladspa-combSplitter + ladspa-const + ladspa-crossoverDist + ladspa-dcRemove + ladspa-decay + ladspa-decimator + ladspa-declip + ladspa-delay-5s + ladspa-delay-c + ladspa-delay-l + ladspa-delay-n + ladspa-delayorama + ladspa-diode + ladspa-divider + ladspa-dj-eq + ladspa-dj-eq-mono + ladspa-djFlanger + ladspa-dysonCompress + ladspa-fadDelay + ladspa-fastLookaheadLimiter + ladspa-flanger + ladspa-fmOsc + ladspa-foldover + ladspa-fourByFourPole + ladspa-foverdrive + ladspa-freqTracker + ladspa-gate + ladspa-giantFlange + ladspa-gong + ladspa-gongBeater + ladspa-gsm + ladspa-gverb + ladspa-hardLimiter + ladspa-harmonicGen + ladspa-hermesFilter + ladspa-highpass-iir + ladspa-hilbert + ladspa-hpf + ladspa-imp + ladspa-impulse-fc + ladspa-inv + ladspa-karaoke + ladspa-lcrDelay + ladspa-lfoPhaser + ladspa-lowpass-iir + ladspa-lpf + ladspa-lsFilter + ladspa-matrixMSSt + ladspa-matrixSpatialiser + ladspa-matrixStMS + ladspa-mbeq + ladspa-modDelay + ladspa-multivoiceChorus + ladspa-noise-white + ladspa-notch-iir + ladspa-pitchScale + ladspa-pitchScaleHQ + ladspa-plate + ladspa-pointerCastDistortion + ladspa-rateShifter + ladspa-retroFlange + ladspa-revdelay + ladspa-ringmod-1i1o1l + ladspa-ringmod-2i1o + ladspa-satanMaximiser + ladspa-sc1 + ladspa-sc2 + ladspa-sc3 + ladspa-sc4 + ladspa-sc4m + ladspa-se4 + ladspa-shaper + ladspa-sifter + ladspa-sinCos + ladspa-sine-faaa + ladspa-sine-faac + ladspa-sine-fcaa + ladspa-sine-fcac + ladspa-singlePara + ladspa-sinusWavewrapper + ladspa-smoothDecimate + ladspa-split + ladspa-stepMuxer + ladspa-surroundEncoder + ladspa-svf + ladspa-tap-autopan + ladspa-tap-chorusflanger + ladspa-tap-deesser + ladspa-tap-doubler + ladspa-tap-dynamics-m + ladspa-tap-dynamics-st + ladspa-tap-equalizer + ladspa-tap-equalizer-bw + ladspa-tap-limiter + ladspa-tap-pinknoise + ladspa-tap-pitch + ladspa-tap-reflector + ladspa-tap-reverb + ladspa-tap-rotspeak + ladspa-tap-sigmoid + ladspa-tap-stereo-echo + ladspa-tap-tremolo + ladspa-tap-tubewarmth + ladspa-tap-vibrato + ladspa-tapeDelay + ladspa-transient + ladspa-triplePara + ladspa-valve + ladspa-valveRect + ladspa-vynil + ladspa-waveTerrain + ladspa-xfade + ladspa-xfade4 + ladspa-zm1 GstSirenDec GstSirenEnc GstSpeed GstSrtEnc + GstTRM GstTemplateMatch GstTtaDec GstTtaParse GstVMncDec - GstValve GstVcdParse + GstVdpVideoPostProcess + GstWildmidi GstXvidDec GstXvidEnc + GstY4mDec Gstedgedetect Gstfaceblur Gstpyramidsegment @@ -176,8 +444,46 @@ GObject MpegTSParse MpegTsMux MpegVideoParse + SatBaseVideoDecoder + GstVdpDecoder + GstVdpH264Dec + GstVdpMpeg4Dec + GstVdpMpegDec + frei0r-mixer-addition + frei0r-mixer-alpha-injection + frei0r-mixer-alphaatop + frei0r-mixer-alphain + frei0r-mixer-alphaout + frei0r-mixer-alphaover + frei0r-mixer-alphaxor + frei0r-mixer-blend + frei0r-mixer-burn + frei0r-mixer-color-only + frei0r-mixer-composition + frei0r-mixer-darken + frei0r-mixer-difference + frei0r-mixer-divide + frei0r-mixer-dodge + frei0r-mixer-grain-extract + frei0r-mixer-grain-merge + frei0r-mixer-hardlight + frei0r-mixer-hue + frei0r-mixer-lighten + frei0r-mixer-multiply + frei0r-mixer-overlay + frei0r-mixer-rgb + frei0r-mixer-saturation + frei0r-mixer-screen + frei0r-mixer-softlight + frei0r-mixer-subtract + frei0r-mixer-uv-map + frei0r-mixer-value + frei0r-mixer-xfade0r GstPad + GstVdpOutputSrcPad + GstVdpVideoSrcPad GstPadTemplate + GstSignalProcessorPadTemplate GstPlugin GstPluginFeature GstElementFactory @@ -185,9 +491,13 @@ GObject GstTypeFindFactory GstRegistry GstRingBuffer + GstAudioSinkRingBuffer + GstJackAudioSinkRingBuffer + GstJackAudioSrcRingBuffer GstTask GstTaskPool GstSignalObject + GstVdpDevice MpegTsPatInfo MpegTsPmtInfo GInterface @@ -195,9 +505,11 @@ GInterface GstChildProxy GstColorBalance GstImplementsInterface + GstMixer GstNavigation GstPhotography GstPreset GstTagSetter GstURIHandler + GstXOverlay MXFDescriptiveMetadataFrameworkInterface diff --git a/docs/plugins/gst-plugins-bad-plugins.interfaces b/docs/plugins/gst-plugins-bad-plugins.interfaces index a135859..bfa93f0 100644 --- a/docs/plugins/gst-plugins-bad-plugins.interfaces +++ b/docs/plugins/gst-plugins-bad-plugins.interfaces @@ -1,25 +1,44 @@ GstBin GstChildProxy GstPipeline GstChildProxy +GstCameraBin GstChildProxy GstImplementsInterface GstColorBalance GstTagSetter GstQTMoovRecover GstChildProxy -GstCameraBin GstChildProxy GstImplementsInterface GstColorBalance GstTagSetter GstPhotography +GstGSettingsSwitchSink GstChildProxy +GstGSettingsAudioSink GstChildProxy +GstGSettingsVideoSink GstChildProxy +GstGSettingsSwitchSrc GstChildProxy +GstGSettingsAudioSrc GstChildProxy +GstGSettingsVideoSrc GstChildProxy +RsnDvdBin GstChildProxy GstURIHandler DvbBaseBin GstChildProxy GstURIHandler -GstSDPDemux GstChildProxy GstAutoConvert GstChildProxy +GstAutoVideoConvert GstChildProxy +GstSDPDemux GstChildProxy GstFPSDisplaySink GstChildProxy -GstXvidEnc GstPreset +GstMpeg2enc GstPreset +GstSDLVideoSink GstImplementsInterface GstXOverlay GstNavigation GstDfbVideoSink GstImplementsInterface GstNavigation GstColorBalance -GstKateEnc GstTagSetter -GstKateTag GstTagSetter +VdpSink GstImplementsInterface GstNavigation GstXOverlay +GstApExSink GstImplementsInterface GstMixer +GstCeltEnc GstTagSetter GstPreset +GstCDAudio GstURIHandler +GstMythtvSrc GstURIHandler GstMMS GstURIHandler +GstNeonhttpSrc GstURIHandler GstVCDSrc GstURIHandler GstDataURISrc GstURIHandler -GstMetadataMux GstTagSetter +GstAmrWbEnc GstPreset GstFaac GstPreset -GstAsfMux GstTagSetter +GstXvidEnc GstPreset +GstDiracEnc GstPreset +GstVP8Enc GstTagSetter GstPreset +GstKateEnc GstTagSetter +GstKateTag GstTagSetter +GstJifMux GstTagSetter GstId3BaseMux GstTagSetter GstId3Mux GstTagSetter -GstJifMux GstTagSetter GstQTMux GstTagSetter GstMP4Mux GstTagSetter +GstISMLMux GstTagSetter GstGPPMux GstTagSetter GstMJ2Mux GstTagSetter +GstAsfMux GstTagSetter diff --git a/docs/plugins/gst-plugins-bad-plugins.prerequisites b/docs/plugins/gst-plugins-bad-plugins.prerequisites index e9203c1..f550060 100644 --- a/docs/plugins/gst-plugins-bad-plugins.prerequisites +++ b/docs/plugins/gst-plugins-bad-plugins.prerequisites @@ -1,6 +1,8 @@ GstChildProxy GstObject GstImplementsInterface GstElement -GstColorBalance GstImplementsInterface GstElement +GstXOverlay GstImplementsInterface GstElement GstTagSetter GstElement -GstPhotography GstImplementsInterface GstElement +GstColorBalance GstImplementsInterface GstElement +GstMixer GstImplementsInterface GstElement MXFDescriptiveMetadataFrameworkInterface MXFDescriptiveMetadata +GstPhotography GstImplementsInterface GstElement diff --git a/docs/plugins/inspect/plugin-valve.xml b/docs/plugins/inspect/plugin-valve.xml deleted file mode 100644 index c67f8cc..0000000 --- a/docs/plugins/inspect/plugin-valve.xml +++ /dev/null @@ -1,34 +0,0 @@ - - valve - Valve - ../../gst/valve/.libs/libgstvalve.so - libgstvalve.so - 0.10.20.1 - LGPL - gst-plugins-bad - GStreamer Bad Plug-ins git - Unknown package origin - - - valve - Valve element - Filter - This element drops all packets when drop is TRUE - Olivier Crete <olivier.crete@collabora.co.uk> - - - sink - sink - always -
ANY
- - - src - source - always -
ANY
- - - - - \ No newline at end of file diff --git a/gst-plugins-bad.spec.in b/gst-plugins-bad.spec.in index 8da39aa..02495e1 100644 --- a/gst-plugins-bad.spec.in +++ b/gst-plugins-bad.spec.in @@ -111,7 +111,6 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/gstreamer-%{majorminor}/libgstmxf.so %{_libdir}/gstreamer-%{majorminor}/libgstvmnc.so %{_libdir}/gstreamer-%{majorminor}/libgstvideosignal.so -%{_libdir}/gstreamer-%{majorminor}/libgstvalve.so %{_libdir}/gstreamer-%{majorminor}/libgstautoconvert.so %{_libdir}/gstreamer-%{majorminor}/libgstdtmf.so %{_libdir}/gstreamer-%{majorminor}/libgstliveadder.so diff --git a/gst/valve/Makefile.am b/gst/valve/Makefile.am deleted file mode 100644 index 4662a13..0000000 --- a/gst/valve/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -plugin_LTLIBRARIES = libgstvalve.la - -libgstvalve_la_SOURCES = gstvalve.c gstvalve.h - -libgstvalve_la_CFLAGS = $(GST_CFLAGS) -libgstvalve_la_LIBADD = $(GST_LIBS) -libgstvalve_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -libgstvalve_la_LIBTOOLFLAGS = --tag=disable-static - diff --git a/gst/valve/gstvalve.c b/gst/valve/gstvalve.c deleted file mode 100644 index 977a4af..0000000 --- a/gst/valve/gstvalve.c +++ /dev/null @@ -1,284 +0,0 @@ -/* GStreamer - * Copyright 2007-2009 Collabora Ltd - * @author: Olivier Crete - * Copyright 2007-2009 Nokia Corporation - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - * - */ - -/** - * SECTION:element-valve - * - * The valve is a simple element that drops buffers when the #GstValve::drop - * property is set to %TRUE and lets then through otherwise. - * - * Any downstream error received while the #GstValve::drop property is %FALSE - * is ignored. So downstream element can be set to %GST_STATE_NULL and removed, - * without using pad blocking. - * - * Last reviewed on 2008-02-10 (0.10.11) - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include "gstvalve.h" - -#include - -GST_DEBUG_CATEGORY (valve_debug); -#define GST_CAT_DEFAULT (valve_debug) - -static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink", - GST_PAD_SINK, - GST_PAD_ALWAYS, - GST_STATIC_CAPS_ANY); - -static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src", - GST_PAD_SRC, - GST_PAD_ALWAYS, - GST_STATIC_CAPS_ANY); - -/* Valve signals and args */ -enum -{ - /* FILL ME */ - LAST_SIGNAL -}; - -enum -{ - ARG_0, - ARG_DROP, -}; - - - - -static void gst_valve_set_property (GObject * object, - guint prop_id, const GValue * value, GParamSpec * pspec); -static void gst_valve_get_property (GObject * object, - guint prop_id, GValue * value, GParamSpec * pspec); - -static gboolean gst_valve_event (GstPad * pad, GstEvent * event); -static GstFlowReturn gst_valve_buffer_alloc (GstPad * pad, guint64 offset, - guint size, GstCaps * caps, GstBuffer ** buf); -static GstFlowReturn gst_valve_chain (GstPad * pad, GstBuffer * buffer); -static GstCaps *gst_valve_getcaps (GstPad * pad); - -#define _do_init(bla) \ - GST_DEBUG_CATEGORY_INIT (valve_debug, "valve", 0, "Valve"); - -GST_BOILERPLATE_FULL (GstValve, gst_valve, GstElement, - GST_TYPE_ELEMENT, _do_init); - -static void -gst_valve_base_init (gpointer klass) -{ - GstElementClass *element_class = GST_ELEMENT_CLASS (klass); - - gst_element_class_add_pad_template (element_class, - gst_static_pad_template_get (&srctemplate)); - gst_element_class_add_pad_template (element_class, - gst_static_pad_template_get (&sinktemplate)); - - gst_element_class_set_details_simple (element_class, "Valve element", - "Filter", - "This element drops all packets when drop is TRUE", - "Olivier Crete "); -} - -static void -gst_valve_class_init (GstValveClass * klass) -{ - GObjectClass *gobject_class; - - gobject_class = (GObjectClass *) klass; - - gobject_class->set_property = GST_DEBUG_FUNCPTR (gst_valve_set_property); - gobject_class->get_property = GST_DEBUG_FUNCPTR (gst_valve_get_property); - - g_object_class_install_property (gobject_class, ARG_DROP, - g_param_spec_boolean ("drop", - "Drops all buffers if TRUE", - "If this property if TRUE, the element will drop all buffers, " - "if its FALSE, it will let them through", - FALSE, G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS)); -} - -static void -gst_valve_init (GstValve * valve, GstValveClass * klass) -{ - valve->drop = FALSE; - valve->discont = FALSE; - - valve->srcpad = gst_pad_new_from_static_template (&srctemplate, "src"); - gst_pad_set_getcaps_function (valve->srcpad, - GST_DEBUG_FUNCPTR (gst_valve_getcaps)); - gst_element_add_pad (GST_ELEMENT (valve), valve->srcpad); - - valve->sinkpad = gst_pad_new_from_static_template (&sinktemplate, "sink"); - gst_pad_set_chain_function (valve->sinkpad, - GST_DEBUG_FUNCPTR (gst_valve_chain)); - gst_pad_set_event_function (valve->sinkpad, - GST_DEBUG_FUNCPTR (gst_valve_event)); - gst_pad_set_bufferalloc_function (valve->sinkpad, - GST_DEBUG_FUNCPTR (gst_valve_buffer_alloc)); - gst_pad_set_getcaps_function (valve->sinkpad, - GST_DEBUG_FUNCPTR (gst_valve_getcaps)); - gst_element_add_pad (GST_ELEMENT (valve), valve->sinkpad); -} - - -static void -gst_valve_set_property (GObject * object, - guint prop_id, const GValue * value, GParamSpec * pspec) -{ - GstValve *valve = GST_VALVE (object); - - switch (prop_id) { - case ARG_DROP: - g_atomic_int_set (&valve->drop, g_value_get_boolean (value)); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -static void -gst_valve_get_property (GObject * object, - guint prop_id, GValue * value, GParamSpec * pspec) -{ - GstValve *valve = GST_VALVE (object); - - switch (prop_id) { - case ARG_DROP: - g_value_set_boolean (value, g_atomic_int_get (&valve->drop)); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } -} - -static GstFlowReturn -gst_valve_chain (GstPad * pad, GstBuffer * buffer) -{ - GstValve *valve = GST_VALVE (GST_OBJECT_PARENT (pad)); - GstFlowReturn ret = GST_FLOW_OK; - - if (g_atomic_int_get (&valve->drop)) { - gst_buffer_unref (buffer); - valve->discont = TRUE; - } else { - if (valve->discont) { - buffer = gst_buffer_make_metadata_writable (buffer); - GST_BUFFER_FLAG_SET (buffer, GST_BUFFER_FLAG_DISCONT); - } - - ret = gst_pad_push (valve->srcpad, buffer); - } - - - /* Ignore errors if "drop" was changed while the thread was blocked - * downwards - */ - if (g_atomic_int_get (&valve->drop)) - ret = GST_FLOW_OK; - - return ret; -} - - -static gboolean -gst_valve_event (GstPad * pad, GstEvent * event) -{ - GstValve *valve = GST_VALVE (gst_pad_get_parent_element (pad)); - gboolean ret = TRUE; - - if (g_atomic_int_get (&valve->drop)) - gst_event_unref (event); - else - ret = gst_pad_push_event (valve->srcpad, event); - - /* Ignore errors if "drop" was changed while the thread was blocked - * downwards. - */ - if (g_atomic_int_get (&valve->drop)) - ret = TRUE; - - gst_object_unref (valve); - return ret; -} - -static GstFlowReturn -gst_valve_buffer_alloc (GstPad * pad, guint64 offset, guint size, - GstCaps * caps, GstBuffer ** buf) -{ - GstValve *valve = GST_VALVE (gst_pad_get_parent_element (pad)); - GstFlowReturn ret = GST_FLOW_OK; - - if (g_atomic_int_get (&valve->drop)) - *buf = NULL; - else - ret = gst_pad_alloc_buffer (valve->srcpad, offset, size, caps, buf); - - /* Ignore errors if "drop" was changed while the thread was blocked - * downwards - */ - if (g_atomic_int_get (&valve->drop)) - ret = GST_FLOW_OK; - - gst_object_unref (valve); - - return ret; -} - -static GstCaps * -gst_valve_getcaps (GstPad * pad) -{ - GstValve *valve = GST_VALVE (gst_pad_get_parent (pad)); - GstCaps *caps; - - if (pad == valve->sinkpad) - caps = gst_pad_peer_get_caps (valve->srcpad); - else - caps = gst_pad_peer_get_caps (valve->sinkpad); - - if (caps == NULL) - caps = gst_caps_copy (gst_pad_get_pad_template_caps (pad)); - - gst_object_unref (valve); - - return caps; -} - - -static gboolean -plugin_init (GstPlugin * plugin) -{ - return gst_element_register (plugin, "valve", - GST_RANK_MARGINAL, GST_TYPE_VALVE); -} - -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, - GST_VERSION_MINOR, - "valve", - "Valve", - plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/gst/valve/gstvalve.h b/gst/valve/gstvalve.h deleted file mode 100644 index 9e15df5..0000000 --- a/gst/valve/gstvalve.h +++ /dev/null @@ -1,82 +0,0 @@ -/* - * Farsight Voice+Video library - * - * Copyright 2007 Collabora Ltd, - * Copyright 2007 Nokia Corporation - * @author: Olivier Crete - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - * - */ - -#ifndef __GST_VALVE_H__ -#define __GST_VALVE_H__ - -#include - -G_BEGIN_DECLS -/* #define's don't like whitespacey bits */ -#define GST_TYPE_VALVE \ - (gst_valve_get_type()) -#define GST_VALVE(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST((obj), \ - GST_TYPE_VALVE,GstValve)) -#define GST_VALVE_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST((klass), \ - GST_TYPE_VALVE,GstValveClass)) -#define GST_IS_VALVE(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_VALVE)) -#define GST_IS_VALVE_CLASS(obj) \ - (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_VALVE)) -typedef struct _GstValve GstValve; -typedef struct _GstValveClass GstValveClass; -typedef struct _GstValvePrivate GstValvePrivate; - -/** - * GstValve: - * - * The private valve structure - */ -struct _GstValve -{ - /*< private >*/ - GstElement parent; - - /* atomic boolean */ - volatile gint drop; - - /* Protected by the stream lock */ - gboolean discont; - - GstPad *srcpad; - GstPad *sinkpad; - - /*< private > */ - gpointer _gst_reserved[GST_PADDING]; -}; - -struct _GstValveClass -{ - GstElementClass parent_class; - - /*< private > */ - gpointer _gst_reserved[GST_PADDING]; -}; - -GType gst_valve_get_type (void); - -G_END_DECLS -#endif /* __GST_VALVE_H__ */ diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am index 947513b..45678f3 100644 --- a/tests/check/Makefile.am +++ b/tests/check/Makefile.am @@ -171,7 +171,6 @@ check_PROGRAMS = \ $(check_mimic) \ elements/rtpmux \ $(check_schro) \ - elements/valve \ $(check_vp8) \ $(check_zbar) \ $(check_orc) \ @@ -235,9 +234,6 @@ elements_kate_LDADD = $(GST_BASE_LIBS) $(LDADD) elements_rtpmux_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(AM_CFLAGS) elements_rtpmux_LDADD = $(GST_BASE_LIBS) $(LDADD) -lgstrtp-0.10 -elements_valve_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(AM_CFLAGS) -elements_valve_LDADD = $(GST_BASE_LIBS) $(LDADD) -lgstrtp-0.10 - elements_assrender_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(AM_CFLAGS) elements_assrender_LDADD = $(GST_BASE_LIBS) $(LDADD) -lgstvideo-0.10 -lgstapp-0.10 diff --git a/tests/check/elements/.gitignore b/tests/check/elements/.gitignore index d9250b8..ec35d9b 100644 --- a/tests/check/elements/.gitignore +++ b/tests/check/elements/.gitignore @@ -38,7 +38,6 @@ selector spectrum timidity y4menc -valve videorecordingbin viewfinderbin vp8dec diff --git a/tests/check/elements/valve.c b/tests/check/elements/valve.c deleted file mode 100644 index d7971bd..0000000 --- a/tests/check/elements/valve.c +++ /dev/null @@ -1,135 +0,0 @@ -/* GStreamer - * - * unit test for the valve element - * - * Copyright 2009 Collabora Ltd. - * @author: Olivier Crete - * Copyright 2009 Nokia Corp. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Library General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Library General Public License for more details. - * - * You should have received a copy of the GNU Library General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#include -#include -#include - - -static GstStaticPadTemplate sinktemplate = GST_STATIC_PAD_TEMPLATE ("sink", - GST_PAD_SINK, - GST_PAD_ALWAYS, - GST_STATIC_CAPS ("audio/x-raw-int")); - -static GstStaticPadTemplate srctemplate = GST_STATIC_PAD_TEMPLATE ("src", - GST_PAD_SRC, - GST_PAD_ALWAYS, - GST_STATIC_CAPS ("audio/x-raw-int")); - -gboolean event_received = FALSE; -gboolean buffer_allocated = FALSE; - -static gboolean -event_func (GstPad * pad, GstEvent * event) -{ - event_received = TRUE; - gst_event_unref (event); - return TRUE; -} - -static GstFlowReturn -bufferalloc_func (GstPad * pad, guint64 offset, guint size, GstCaps * caps, - GstBuffer ** buf) -{ - buffer_allocated = TRUE; - *buf = gst_buffer_new_and_alloc (size); - GST_BUFFER_OFFSET (*buf) = offset; - gst_buffer_set_caps (*buf, caps); - - return GST_FLOW_OK; -} - -GST_START_TEST (test_valve_basic) -{ - GstElement *valve; - GstPad *sink; - GstPad *src; - GstBuffer *buf; - GstCaps *caps; - - valve = gst_check_setup_element ("valve"); - - sink = gst_check_setup_sink_pad_by_name (valve, &sinktemplate, "src"); - src = gst_check_setup_src_pad_by_name (valve, &srctemplate, "sink"); - gst_pad_set_event_function (sink, event_func); - gst_pad_set_bufferalloc_function (sink, bufferalloc_func); - gst_pad_set_active (src, TRUE); - gst_pad_set_active (sink, TRUE); - gst_element_set_state (valve, GST_STATE_PLAYING); - - g_object_set (valve, "drop", FALSE, NULL); - - fail_unless (gst_pad_push_event (src, gst_event_new_eos ()) == TRUE); - fail_unless (event_received == TRUE); - fail_unless (gst_pad_alloc_buffer (src, 0, 10, NULL, &buf) == GST_FLOW_OK); - fail_unless (buffer_allocated == TRUE); - gst_buffer_unref (buf); - fail_unless (gst_pad_push (src, gst_buffer_new ()) == GST_FLOW_OK); - fail_unless (gst_pad_push (src, gst_buffer_new ()) == GST_FLOW_OK); - fail_unless (g_list_length (buffers) == 2); - caps = gst_pad_get_caps (src); - fail_unless (caps && gst_caps_is_equal (caps, - gst_pad_get_pad_template_caps (src))); - gst_caps_unref (caps); - - gst_check_drop_buffers (); - event_received = buffer_allocated = FALSE; - - g_object_set (valve, "drop", TRUE, NULL); - fail_unless (gst_pad_push_event (src, gst_event_new_eos ()) == TRUE); - fail_unless (event_received == FALSE); - fail_unless (gst_pad_alloc_buffer (src, 0, 10, NULL, &buf) == GST_FLOW_OK); - fail_unless (buffer_allocated == FALSE); - gst_buffer_unref (buf); - fail_unless (gst_pad_push (src, gst_buffer_new ()) == GST_FLOW_OK); - fail_unless (gst_pad_push (src, gst_buffer_new ()) == GST_FLOW_OK); - fail_unless (buffers == NULL); - caps = gst_pad_get_caps (src); - fail_unless (caps && gst_caps_is_equal (caps, - gst_pad_get_pad_template_caps (src))); - gst_caps_unref (caps); - - gst_pad_set_active (src, FALSE); - gst_pad_set_active (sink, FALSE); - gst_check_teardown_src_pad (valve); - gst_check_teardown_sink_pad (valve); - gst_check_teardown_element (valve); -} - -GST_END_TEST; - -static Suite * -valve_suite (void) -{ - Suite *s = suite_create ("valve"); - TCase *tc_chain; - - tc_chain = tcase_create ("valve_basic"); - tcase_add_test (tc_chain, test_valve_basic); - suite_add_tcase (s, tc_chain); - - return s; -} - -GST_CHECK_MAIN (valve)