diff options
| author | David Schleef <ds@schleef.org> | 2003-12-03 10:20:33 +0000 |
|---|---|---|
| committer | David Schleef <ds@schleef.org> | 2003-12-03 10:20:33 +0000 |
| commit | c7ced6bec1f5604604f12588f04b06772079912e (patch) | |
| tree | 41ab994a0e91ff67cfedd50d2182516e7bf81aa5 | |
| parent | b0994f7eb8173a277997ee0e3e15b6b70d79efcf (diff) | |
| download | gstreamer-plugins-bad-c7ced6bec1f5604604f12588f04b06772079912e.tar.gz | |
convert to new caps
Original commit message from CVS:
convert to new caps
| -rw-r--r-- | gst-libs/gst/audio/audio.h | 91 |
1 files changed, 35 insertions, 56 deletions
diff --git a/gst-libs/gst/audio/audio.h b/gst-libs/gst/audio/audio.h index 0958f6547..9a193c2d8 100644 --- a/gst-libs/gst/audio/audio.h +++ b/gst-libs/gst/audio/audio.h @@ -50,66 +50,45 @@ G_BEGIN_DECLS #define GST_AUDIO_DEF_RATE 44100 -#define GST_AUDIO_INT_PAD_TEMPLATE_PROPS \ - gst_props_new (\ - "rate", GST_PROPS_INT_RANGE (1, G_MAXINT),\ - "channels", GST_PROPS_INT_RANGE (1, G_MAXINT),\ - "endianness", GST_PROPS_LIST (\ - GST_PROPS_INT (G_LITTLE_ENDIAN),\ - GST_PROPS_INT (G_BIG_ENDIAN)\ - ),\ - "width", GST_PROPS_LIST (\ - GST_PROPS_INT (8),\ - GST_PROPS_INT (16),\ - GST_PROPS_INT (32)\ - ),\ - "depth", GST_PROPS_INT_RANGE (1, 32),\ - "signed", GST_PROPS_LIST (\ - GST_PROPS_BOOLEAN (TRUE),\ - GST_PROPS_BOOLEAN (FALSE)\ - ),\ - "buffer-frames", GST_PROPS_INT_RANGE (1, G_MAXINT),\ - NULL) +#define GST_AUDIO_INT_PAD_TEMPLATE_CAPS \ + "audio/x-raw-int, " \ + "rate = (int) [ 1, " G_STRINGIFY(G_MAXINT) ", " \ + "channels = (int) [ 1, " G_STRINGIFY(G_MAXINT) ", " \ + "endianness = (int) { " G_STRINGIFY(G_LITTLE_ENDIAN) ", " \ + G_STRINGIFY(G_BIG_ENDIAN) "}, " \ + "width = (int) { 8, 16, 32 }, " \ + "depth = (int) [ 1, 32 ], " \ + "signed = (boolean) { true, false }, " \ + "buffer-frames = (int) [ 1, " G_STRINGIFY(G_MAXINT) "]" + /* "standard" int audio is native order, 16 bit stereo. */ -#define GST_AUDIO_INT_STANDARD_PAD_TEMPLATE_PROPS \ - gst_props_new (\ - "rate", GST_PROPS_INT_RANGE (1, G_MAXINT),\ - "channels", GST_PROPS_INT (2),\ - "endianness", GST_PROPS_INT (G_BYTE_ORDER),\ - "width", GST_PROPS_INT (16),\ - "depth", GST_PROPS_INT (16),\ - "signed", GST_PROPS_LIST (\ - GST_PROPS_BOOLEAN (TRUE),\ - GST_PROPS_BOOLEAN (FALSE)\ - ),\ - "buffer-frames", GST_PROPS_INT_RANGE (1, G_MAXINT),\ - NULL) - -#define GST_AUDIO_FLOAT_PAD_TEMPLATE_PROPS \ - gst_props_new (\ - "rate", GST_PROPS_INT_RANGE (1, G_MAXINT),\ - "channels", GST_PROPS_INT_RANGE (1, G_MAXINT),\ - "endianness", GST_PROPS_LIST (\ - GST_PROPS_INT (G_LITTLE_ENDIAN),\ - GST_PROPS_INT (G_BIG_ENDIAN)\ - ),\ - "width", GST_PROPS_LIST (\ - GST_PROPS_INT (32),\ - GST_PROPS_INT (64)\ - ),\ - "buffer-frames", GST_PROPS_INT_RANGE (1, G_MAXINT),\ - NULL) +#define GST_AUDIO_INT_STANDARD_PAD_TEMPLATE_CAPS \ + "audio/x-raw-int, " \ + "rate = (int) [ 1, " G_STRINGIFY(G_MAXINT) ", " \ + "channels = (int) 2, " \ + "endianness = (int) " G_STRINGIFY(G_BYTE_ORDER) ", " \ + "width = (int) 16, " \ + "depth = (int) 16, " \ + "signed = (boolean) { true, false }, " \ + "buffer-frames = (int) [ 1, " G_STRINGIFY(G_MAXINT) "]" + +#define GST_AUDIO_FLOAT_PAD_TEMPLATE_CAPS \ + "audio/x-raw-float, " \ + "rate = (int) [ 1, " G_STRINGIFY(G_MAXINT) ", " \ + "channels = (int) [ 1, " G_STRINGIFY(G_MAXINT) ", " \ + "endianness = (int) { " G_STRINGIFY(G_LITTLE_ENDIAN) ", " \ + G_STRINGIFY(G_BIG_ENDIAN) "}, " \ + "width = (int) { 32, 64 }, " \ + "buffer-frames = (int) [ 1, " G_STRINGIFY(G_MAXINT) "]" /* "standard" float audio is native order, 32 bit mono. */ -#define GST_AUDIO_FLOAT_STANDARD_PAD_TEMPLATE_PROPS \ - gst_props_new (\ - "rate", GST_PROPS_INT_RANGE (1, G_MAXINT),\ - "channels", GST_PROPS_INT (1),\ - "endianness", GST_PROPS_INT (G_BYTE_ORDER),\ - "width", GST_PROPS_INT (32),\ - "buffer-frames", GST_PROPS_INT_RANGE (1, G_MAXINT),\ - NULL) +#define GST_AUDIO_FLOAT_STANDARD_PAD_TEMPLATE_CAPS \ + "audio/x-raw-float, " \ + "rate = (int) [ 1, " G_STRINGIFY(G_MAXINT) ", " \ + "channels = (int) 1, " \ + "endianness = (int) " G_STRINGIFY(G_BYTE_ORDER) ", " \ + "buffer-frames = (int) [ 1, " G_STRINGIFY(G_MAXINT) "]" /* * this library defines and implements some helper functions for audio |