gst: Add new layout field to all raw audio caps

This commit is contained in:
Sebastian Dröge 2011-12-31 14:31:08 +01:00
parent 75f91ebea0
commit 8cd8965e19
3 changed files with 12 additions and 6 deletions

View file

@ -76,10 +76,12 @@ GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT);
#if G_BYTE_ORDER == G_LITTLE_ENDIAN #if G_BYTE_ORDER == G_LITTLE_ENDIAN
#define CAPS \ #define CAPS \
GST_AUDIO_CAPS_MAKE ("{ S32LE, U32LE, S16LE, U16LE, S8, U8, F32LE, F64LE }") GST_AUDIO_CAPS_MAKE ("{ S32LE, U32LE, S16LE, U16LE, S8, U8, F32LE, F64LE }") \
", layout = (string) { interleaved, non-interleaved }"
#else #else
#define CAPS \ #define CAPS \
GST_AUDIO_CAPS_MAKE ("{ S32BE, U32BE, S16BE, U16BE, S8, U8, F32BE, F64BE }") GST_AUDIO_CAPS_MAKE ("{ S32BE, U32BE, S16BE, U16BE, S8, U8, F32BE, F64BE }") \
", layout = (string) { interleaved, non-interleaved }"
#endif #endif
static GstStaticPadTemplate gst_adder_src_template = static GstStaticPadTemplate gst_adder_src_template =

View file

@ -96,14 +96,16 @@ static GstStaticPadTemplate gst_audio_rate_src_template =
GST_STATIC_PAD_TEMPLATE ("src", GST_STATIC_PAD_TEMPLATE ("src",
GST_PAD_SRC, GST_PAD_SRC,
GST_PAD_ALWAYS, GST_PAD_ALWAYS,
GST_STATIC_CAPS (GST_AUDIO_CAPS_MAKE (GST_AUDIO_FORMATS_ALL)) GST_STATIC_CAPS (GST_AUDIO_CAPS_MAKE (GST_AUDIO_FORMATS_ALL)
", layout = (string) { interleaved, non-interleaved }")
); );
static GstStaticPadTemplate gst_audio_rate_sink_template = static GstStaticPadTemplate gst_audio_rate_sink_template =
GST_STATIC_PAD_TEMPLATE ("sink", GST_STATIC_PAD_TEMPLATE ("sink",
GST_PAD_SINK, GST_PAD_SINK,
GST_PAD_ALWAYS, GST_PAD_ALWAYS,
GST_STATIC_CAPS (GST_AUDIO_CAPS_MAKE (GST_AUDIO_FORMATS_ALL)) GST_STATIC_CAPS (GST_AUDIO_CAPS_MAKE (GST_AUDIO_FORMATS_ALL)
", layout = (string) { interleaved, non-interleaved }")
); );
static gboolean gst_audio_rate_sink_event (GstPad * pad, GstObject * parent, static gboolean gst_audio_rate_sink_event (GstPad * pad, GstObject * parent,

View file

@ -104,10 +104,12 @@ enum
#if G_BYTE_ORDER == G_LITTLE_ENDIAN #if G_BYTE_ORDER == G_LITTLE_ENDIAN
#define ALLOWED_CAPS \ #define ALLOWED_CAPS \
GST_AUDIO_CAPS_MAKE ("{ F32LE, F64LE, S8, S16LE, S24LE, S32LE }") GST_AUDIO_CAPS_MAKE ("{ F32LE, F64LE, S8, S16LE, S24LE, S32LE }") \
", layout = (string) interleaved"
#else #else
#define ALLOWED_CAPS \ #define ALLOWED_CAPS \
GST_AUDIO_CAPS_MAKE ("{ F32BE, F64BE, S8, S16BE, S24BE, S32BE }") GST_AUDIO_CAPS_MAKE ("{ F32BE, F64BE, S8, S16BE, S24BE, S32BE }") \
", layout = (string) { interleaved, non-interleaved }"
#endif #endif
static void gst_volume_mixer_init (GstMixerInterface * iface); static void gst_volume_mixer_init (GstMixerInterface * iface);