mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-29 05:01:23 +00:00
Code Issues 1 Projects Releases Wiki Activity

riff: Add the layout field to the raw audio caps

Browse source
This commit is contained in:
Sebastian Dröge 2011-12-31 13:50:04 +01:00
parent 9d56bf7712
commit 7cd0659032
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gst-libs/gst/riff/riff-media.c
View file

@ -1151,6 +1151,7 @@ gst_riff_create_audio_caps (guint16 codec_id,
caps = gst_caps_new_simple ("audio/x-raw", caps = gst_caps_new_simple ("audio/x-raw",
"format", G_TYPE_STRING, gst_audio_format_to_string (format), "format", G_TYPE_STRING, gst_audio_format_to_string (format),
"layout", G_TYPE_STRING, "interleaved",
"channels", G_TYPE_INT, ch, NULL); "channels", G_TYPE_INT, ch, NULL);
/* Add default channel layout. In theory this should be done /* Add default channel layout. In theory this should be done
@ -1169,7 +1170,7 @@ gst_riff_create_audio_caps (guint16 codec_id,
/* FIXME: this is pretty useless - we need fixed caps */ /* FIXME: this is pretty useless - we need fixed caps */
caps = gst_caps_from_string ("audio/x-raw, " caps = gst_caps_from_string ("audio/x-raw, "
"format = (string) { S8, U8, S16LE, U16LE, S24LE, " "format = (string) { S8, U8, S16LE, U16LE, S24LE, "
"U24LE, S32LE, U32LE }"); "U24LE, S32LE, U32LE }, " "layout = (string) interleaved");
} }
if (codec_name && strf) if (codec_name && strf)
*codec_name = g_strdup_printf ("Uncompressed %d-bit PCM audio", *codec_name = g_strdup_printf ("Uncompressed %d-bit PCM audio",
@ -1195,6 +1196,7 @@ gst_riff_create_audio_caps (guint16 codec_id,
caps = gst_caps_new_simple ("audio/x-raw", caps = gst_caps_new_simple ("audio/x-raw",
"format", G_TYPE_STRING, wd == 64 ? "F64LE" : "F32LE", "format", G_TYPE_STRING, wd == 64 ? "F64LE" : "F32LE",
"layout", G_TYPE_STRING, "interleaved",
"channels", G_TYPE_INT, ch, NULL); "channels", G_TYPE_INT, ch, NULL);
/* Add default channel layout. In theory this should be done /* Add default channel layout. In theory this should be done
@ -1212,7 +1214,8 @@ gst_riff_create_audio_caps (guint16 codec_id,
} else { } else {
/* FIXME: this is pretty useless - we need fixed caps */ /* FIXME: this is pretty useless - we need fixed caps */
caps = gst_caps_from_string ("audio/x-raw, " caps = gst_caps_from_string ("audio/x-raw, "
"format = (string) { F32LE, F64LE }"); "format = (string) { F32LE, F64LE }, "
"layout = (string) interleaved");
} }
if (codec_name && strf) if (codec_name && strf)
*codec_name = g_strdup_printf ("Uncompressed %d-bit IEEE float audio", *codec_name = g_strdup_printf ("Uncompressed %d-bit IEEE float audio",
@ -1515,6 +1518,7 @@ gst_riff_create_audio_caps (guint16 codec_id,
caps = gst_caps_new_simple ("audio/x-raw", caps = gst_caps_new_simple ("audio/x-raw",
"format", G_TYPE_STRING, gst_audio_format_to_string (format), "format", G_TYPE_STRING, gst_audio_format_to_string (format),
"layout", G_TYPE_STRING, "interleaved",
"channels", G_TYPE_INT, strf->channels, "channels", G_TYPE_INT, strf->channels,
"rate", G_TYPE_INT, strf->rate, NULL); "rate", G_TYPE_INT, strf->rate, NULL);
@ -1547,6 +1551,7 @@ gst_riff_create_audio_caps (guint16 codec_id,
caps = gst_caps_new_simple ("audio/x-raw", caps = gst_caps_new_simple ("audio/x-raw",
"format", G_TYPE_STRING, wd == 32 ? "F32LE" : "F64LE", "format", G_TYPE_STRING, wd == 32 ? "F32LE" : "F64LE",
"layout", G_TYPE_STRING, "interleaved",
"channels", G_TYPE_INT, strf->channels, "channels", G_TYPE_INT, strf->channels,
"rate", G_TYPE_INT, strf->rate, NULL); "rate", G_TYPE_INT, strf->rate, NULL);