diff options
| author | 2020-06-15 20:11:02 +0900 | |
|---|---|---|
| committer | 2021-04-20 14:16:21 -0700 | |
| commit | 209bf897de147250fa3d77a8d90adb68c9f341c2 (patch) | |
| tree | 0987d3e955baa065fc6177662c0e542ac84b4429 | |
| parent | 8008740a46ad65b3e3fc52bdc8841df3ca8512eb (diff) | |
AudioFormat: Support 13ch audio layout for 360 Reality Audio
- Add definitions for the front bottom channels. The name
of the definitions are standardized in ITU-R BS.2051-1.
- Add definition for 13ch mask which consists of surround 5
channels, top 5 channels and bottom 3ch channels. This
channel mask is ideal speaker layout used by Sony 360
Reality Audio. Virtualizer can place individual sounds in
a 360 spherical sound field from these channels on any
headphones.
Ignoring checkstyle warning, "'|' should be on a new line",
to keep existing codestyle.
Bug: 185100731
Test: atest AudioFormatTest
Test: Play wav with 13ch mask after OUT_CHANNEL_COUNT_MAX to 24
Change-Id: I2b4deaac740a08ae3b1b8d8453650a876e2d6206
| -rw-r--r-- | media/java/android/media/AudioFormat.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/media/java/android/media/AudioFormat.java b/media/java/android/media/AudioFormat.java index 262e8c67cd7f..090812e39c5f 100644 --- a/media/java/android/media/AudioFormat.java +++ b/media/java/android/media/AudioFormat.java @@ -434,6 +434,15 @@ public final class AudioFormat implements Parcelable { CHANNEL_OUT_TOP_FRONT_LEFT | CHANNEL_OUT_TOP_FRONT_RIGHT | CHANNEL_OUT_TOP_BACK_LEFT | CHANNEL_OUT_TOP_BACK_RIGHT); /** @hide */ + public static final int CHANNEL_OUT_13POINT_360RA = ( + CHANNEL_OUT_FRONT_LEFT | CHANNEL_OUT_FRONT_CENTER | CHANNEL_OUT_FRONT_RIGHT | + CHANNEL_OUT_SIDE_LEFT | CHANNEL_OUT_SIDE_RIGHT | + CHANNEL_OUT_TOP_FRONT_LEFT | CHANNEL_OUT_TOP_FRONT_CENTER | + CHANNEL_OUT_TOP_FRONT_RIGHT | + CHANNEL_OUT_TOP_BACK_LEFT | CHANNEL_OUT_TOP_BACK_RIGHT | + CHANNEL_OUT_BOTTOM_FRONT_LEFT | CHANNEL_OUT_BOTTOM_FRONT_CENTER | + CHANNEL_OUT_BOTTOM_FRONT_RIGHT); + /** @hide */ public static final int CHANNEL_OUT_22POINT2 = (CHANNEL_OUT_7POINT1POINT4 | CHANNEL_OUT_FRONT_LEFT_OF_CENTER | CHANNEL_OUT_FRONT_RIGHT_OF_CENTER | CHANNEL_OUT_BACK_CENTER | CHANNEL_OUT_TOP_CENTER | |