Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AudioFormat: Support 13ch audio layout for 360 Reality Audio

Browse Source 
- 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
This commit is contained in:
Kei Murayama
2020-06-15 20:11:02 +09:00
committed by Andy Hung
parent 8008740a46
commit 209bf897de
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
media/java/android/media/AudioFormat.java
View File

@@ -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 |