diff options
| author | David Schleef <ds@schleef.org> | 2004-01-15 21:05:17 +0000 |
|---|---|---|
| committer | David Schleef <ds@schleef.org> | 2004-01-15 21:05:17 +0000 |
| commit | 51db8f1fe22c6b419dc63eb05e4386345447664b (patch) | |
| tree | 9f448ac65b5d2b75744e54da6eb8a0a99f39b5dd /gst/wavparse | |
| parent | 36470772d630619cacc1d2e669acae42b7e56c56 (diff) | |
ext/esd/esdsink.c: Remove property that handles osssink fallback.
Original commit message from CVS:
* ext/esd/esdsink.c: (gst_esdsink_class_init): Remove property
that handles osssink fallback.
* gst/audioconvert/gstaudioconvert.c: (gst_audio_convert_init),
(gst_audio_convert_getcaps):
* gst/qtdemux/qtdemux.c: (qtdemux_audio_caps):
Add audio/x-qdm2 for QDM2 audio.
* gst/sine/gstsinesrc.c: (gst_sinesrc_get):
* gst/sine/gstsinesrc.h: Add example of how to implement tags.
* gst/videoscale/gstvideoscale.c: (gst_videoscale_getcaps):
Decrease minimum size to 16x16.
* gst/wavparse/gstwavparse.c:
Convert disabled pad template caps to new caps.
* sys/ximage/ximagesink.c: (gst_ximagesink_xcontext_get):
* sys/xvimage/xvimagesink.c: (gst_xvimagesink_xcontext_get),
(gst_xvimagesink_chain): Throw element error when display cannot
be opened. Increase minimum framerate to 1.0. Check the data
free function on a buffer to make sure it is the type we expect
before manipulating it.
Diffstat (limited to 'gst/wavparse')
| -rw-r--r-- | gst/wavparse/gstwavparse.c | 60 |
1 files changed, 19 insertions, 41 deletions
diff --git a/gst/wavparse/gstwavparse.c b/gst/wavparse/gstwavparse.c index 73468f43..382192a4 100644 --- a/gst/wavparse/gstwavparse.c +++ b/gst/wavparse/gstwavparse.c @@ -73,49 +73,27 @@ GST_STATIC_PAD_TEMPLATE ( "wavparse_src", GST_PAD_SRC, GST_PAD_ALWAYS, - GST_STATIC_CAPS_ANY -); -#if 0 - GST_STATIC_CAPS ( - "wavparse_raw", - "audio/x-raw-int", - "endianness", G_TYPE_INT (G_LITTLE_ENDIAN), - "signed", GST_PROPS_LIST ( - G_TYPE_BOOLEAN (FALSE), - G_TYPE_BOOLEAN (TRUE) - ), - "width", GST_PROPS_LIST ( - G_TYPE_INT (8), - G_TYPE_INT (16) - ), - "depth", GST_PROPS_LIST ( - G_TYPE_INT (8), - G_TYPE_INT (16) - ), - "rate", G_TYPE_INT_RANGE (8000, 48000), - "channels", G_TYPE_INT_RANGE (1, 2) - ), - GST_STATIC_CAPS ( - "wavparse_mpeg", - "audio/mpeg", - "mpegversion", G_TYPE_INT, 1, - "rate", G_TYPE_INT_RANGE (8000, 48000), - "channels", G_TYPE_INT_RANGE (1, 2), - "layer", G_TYPE_INT_RANGE (1, 3) - ), GST_STATIC_CAPS ( - "parsewav_law", - "audio/x-alaw", - "rate", G_TYPE_INT_RANGE (8000, 48000), - "channels", G_TYPE_INT_RANGE (1, 2) - ), - GST_STATIC_CAPS ( - "parsewav_law", - "audio/x-mulaw", - "rate", G_TYPE_INT_RANGE (8000, 48000), - "channels", G_TYPE_INT_RANGE (1, 2) + "audio/x-raw-int, " + "endianness = (int) little_endian, " + "signed = (boolean) { true, false }, " + "width = (int) { 8, 16 }, " + "depth = (int) { 8, 16 }, " + "rate = (int) [ 8000, 48000 ], " + "channels = (int) [ 1, 2 ]; " + "audio/mpeg, " + "mpegversion = (int) 1, " + "layer = (int) [ 1, 3 ], " + "rate = (int) [ 8000, 48000 ], " + "channels = (int) [ 1, 2 ]; " + "audio/x-alaw, " + "rate = (int) [ 8000, 48000 ], " + "channels = (int) [ 1, 2 ]; " + "audio/x-mulaw, " + "rate = (int) [ 8000, 48000 ], " + "channels = (int) [ 1, 2 ]" ) -#endif +); /* WavParse signals and args */ enum { |