summaryrefslogtreecommitdiff
path: root/sys/opensles
diff options
context:
space:
mode:
authorArun Raghavan <arun@centricular.com>2015-04-08 10:52:17 +0530
committerArun Raghavan <git@arunraghavan.net>2015-04-08 15:38:17 +0530
commitb40adec9c12ea3fa87fbe78000b0b080144b8001 (patch)
treea58a0ca93eec239566943222aff7b6219a455a28 /sys/opensles
parent5352ba19acca30882205d9d7ed3cbd23248d967c (diff)
opensles: Explicitly specify layout=interleaved in caps
This is fine to hard-code. Section 9.1.8 of the OpenSL ES 1.1 specification, it is expected that multi-channel audio is always interleaved.
Diffstat (limited to 'sys/opensles')
-rw-r--r--sys/opensles/openslessink.c3
-rw-r--r--sys/opensles/openslessrc.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/sys/opensles/openslessink.c b/sys/opensles/openslessink.c
index 266174a0c..236f8b3c6 100644
--- a/sys/opensles/openslessink.c
+++ b/sys/opensles/openslessink.c
@@ -65,7 +65,8 @@ static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink",
GST_PAD_ALWAYS,
GST_STATIC_CAPS ("audio/x-raw, "
"format = (string) { " GST_AUDIO_NE (S16) ", " GST_AUDIO_NE (U8) "}, "
- "rate = (int) { " RATES "}, " "channels = (int) [1, 2]")
+ "rate = (int) { " RATES "}, " "channels = (int) [1, 2], "
+ "layout = (string) interleaved")
);
#define _do_init \
diff --git a/sys/opensles/openslessrc.c b/sys/opensles/openslessrc.c
index 3fd9cb270..18db5eb19 100644
--- a/sys/opensles/openslessrc.c
+++ b/sys/opensles/openslessrc.c
@@ -48,7 +48,8 @@ static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src",
GST_STATIC_CAPS ("audio/x-raw, "
"format = (string) " GST_AUDIO_NE (S16) ", "
"rate = (int) 16000, "
- "channels = (int) 1")
+ "channels = (int) 1, "
+ "layout = (string) interleaved")
);
/* *INDENT-ON* */