gst: Add new layout field to the raw audio caps

This commit is contained in:
Sebastian Dröge 2011-12-31 14:21:27 +01:00
parent c52b50a517
commit 5bdf6b3383
3 changed files with 7 additions and 3 deletions

View file

@ -116,7 +116,8 @@ G_DEFINE_TYPE_WITH_CODE (GstAudioConvert, gst_audio_convert,
/*** GSTREAMER PROTOTYPES *****************************************************/
#define STATIC_CAPS \
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")
static GstStaticPadTemplate gst_audio_convert_src_template =
GST_STATIC_PAD_TEMPLATE ("src",

View file

@ -67,10 +67,12 @@ enum
#if G_BYTE_ORDER == G_LITTLE_ENDIAN
#define SUPPORTED_CAPS \
GST_AUDIO_CAPS_MAKE ("{ F32LE, F64LE, S32LE, S24LE, S16LE, S8 }")
GST_AUDIO_CAPS_MAKE ("{ F32LE, F64LE, S32LE, S24LE, S16LE, S8 }") \
", layout = (string) { interleaved, non-interleaved }"
#else
#define SUPPORTED_CAPS \
GST_AUDIO_CAPS_MAKE ("{ F32BE, F64BE, S32BE, S24BE, S16BE, S8 }")
GST_AUDIO_CAPS_MAKE ("{ F32BE, F64BE, S32BE, S24BE, S16BE, S8 }") \
", layout = (string) { interleaved, non-interleaved }"
#endif
/* If TRUE integer arithmetic resampling is faster and will be used if appropriate */

View file

@ -89,6 +89,7 @@ GST_STATIC_PAD_TEMPLATE ("src",
GST_PAD_ALWAYS,
GST_STATIC_CAPS ("audio/x-raw, "
"format = (string) " FORMAT_STR ", "
"layout = (string) interleaved, "
"rate = (int) [ 1, MAX ], " "channels = (int) [ 1, 2 ]")
);