summaryrefslogtreecommitdiffstats
path: root/gst-libs
diff options
context:
space:
mode:
authorThomas Vander Stichele <thomas@apestaart.org>2002-09-09 08:39:58 +0000
committerThomas Vander Stichele <thomas@apestaart.org>2002-09-09 08:39:58 +0000
commit9153128bda022aed24a1ab887e16d09963248efd (patch)
tree49972a6c21a490079b43cecc8adee9c803207e65 /gst-libs
parent657579947e7da87e02879c687b7bca78d18781b6 (diff)
downloadgst-plugins-bad-9153128bda022aed24a1ab887e16d09963248efd.tar.gz
gst-plugins-bad-9153128bda022aed24a1ab887e16d09963248efd.tar.bz2
gst-plugins-bad-9153128bda022aed24a1ab887e16d09963248efd.zip
some simple fixes and additions
Original commit message from CVS: some simple fixes and additions
Diffstat (limited to 'gst-libs')
-rw-r--r--gst-libs/gst/audio/audio.h42
1 files changed, 28 insertions, 14 deletions
diff --git a/gst-libs/gst/audio/audio.h b/gst-libs/gst/audio/audio.h
index 4672a4d6..2b27d0fe 100644
--- a/gst-libs/gst/audio/audio.h
+++ b/gst-libs/gst/audio/audio.h
@@ -20,15 +20,16 @@
#include <gst/gst.h>
-/* for people that are looking at this source: the purpose of these defines is
+/* For people that are looking at this source: the purpose of these defines is
* to make GstCaps a bit easier, in that you don't have to know all of the
* properties that need to be defined. you can just use these macros. currently
* (8/01) the only plugins that use these are the passthrough, speed, volume,
- * and [de]interleave plugins. so. these are for convenience only, and do not
- * specify the 'limits' of gstreamer. you might also use these definitions as a
+ * adder, and [de]interleave plugins.
+ * These are for convenience only, and do not specify the 'limits' of
+ * GStreamer. you might also use these definitions as a
* base for making your own caps, if need be.
*
- * for example, to make a source pad that can output mono streams of either
+ * For example, to make a source pad that can output mono streams of either
* float or int:
template = gst_pad_template_new
@@ -41,7 +42,13 @@
srcpad = gst_pad_new_from_template(template,"src");
- * Andy Wingo, 18 August 2001 */
+ * Andy Wingo, 18 August 2001
+ * Thomas, 6 September 2002 */
+
+/* a few useful defines for arbitrary limits */
+#define GST_AUDIO_MIN_RATE 4000
+#define GST_AUDIO_MAX_RATE 96000
+#define GST_AUDIO_DEF_RATE 44100
#define GST_AUDIO_INT_PAD_TEMPLATE_PROPS \
gst_props_new (\
@@ -50,11 +57,14 @@
"endianness", GST_PROPS_INT (G_BYTE_ORDER),\
"signed", GST_PROPS_LIST (\
GST_PROPS_BOOLEAN (TRUE),\
- GST_PROPS_BOOLEAN(FALSE)\
+ GST_PROPS_BOOLEAN (FALSE)\
),\
- "width", GST_PROPS_LIST (GST_PROPS_INT(8), GST_PROPS_INT(16)),\
- "depth", GST_PROPS_LIST (GST_PROPS_INT(8), GST_PROPS_INT(16)),\
- "rate", GST_PROPS_INT_RANGE (4000, 96000),\
+ "width", GST_PROPS_LIST (GST_PROPS_INT (8), \
+ GST_PROPS_INT (16)), \
+ "depth", GST_PROPS_LIST (GST_PROPS_INT (8), \
+ GST_PROPS_INT (16)),\
+ "rate", GST_PROPS_INT_RANGE (GST_AUDIO_MIN_RATE, \
+ GST_AUDIO_MAX_RATE),\
"channels", GST_PROPS_INT_RANGE (1, G_MAXINT),\
NULL)
@@ -65,11 +75,14 @@
"endianness", GST_PROPS_INT (G_BYTE_ORDER),\
"signed", GST_PROPS_LIST (\
GST_PROPS_BOOLEAN (TRUE),\
- GST_PROPS_BOOLEAN(FALSE)\
+ GST_PROPS_BOOLEAN (FALSE)\
),\
- "width", GST_PROPS_LIST (GST_PROPS_INT(8), GST_PROPS_INT(16)),\
- "depth", GST_PROPS_LIST (GST_PROPS_INT(8), GST_PROPS_INT(16)),\
- "rate", GST_PROPS_INT_RANGE (4000, 96000),\
+ "width", GST_PROPS_LIST (GST_PROPS_INT (8), \
+ GST_PROPS_INT (16)),\
+ "depth", GST_PROPS_LIST (GST_PROPS_INT (8), \
+ GST_PROPS_INT (16)),\
+ "rate", GST_PROPS_INT_RANGE (GST_AUDIO_MIN_RATE, \
+ GST_AUDIO_MAX_RATE),\
"channels", GST_PROPS_INT (1),\
NULL)
@@ -79,7 +92,8 @@
"layout", GST_PROPS_STRING ("gfloat"),\
"intercept", GST_PROPS_FLOAT (0.0),\
"slope", GST_PROPS_FLOAT (1.0),\
- "rate", GST_PROPS_INT_RANGE (4000, 96000),\
+ "rate", GST_PROPS_INT_RANGE (GST_AUDIO_MIN_RATE, \
+ GST_AUDIO_MAX_RATE),\
"channels", GST_PROPS_INT (1),\
NULL)