diff options
| -rw-r--r-- | core/api/current.txt | 1 | ||||
| -rw-r--r-- | media/java/android/media/AudioFormat.java | 3 | ||||
| -rw-r--r-- | media/java/android/media/audio/common/AidlConversion.java | 8 |
3 files changed, 5 insertions, 7 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index 4d25ad7d8b37..88b334080d38 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -20057,6 +20057,7 @@ package android.media { field public static final int CHANNEL_OUT_5POINT1 = 252; // 0xfc field public static final int CHANNEL_OUT_5POINT1POINT2 = 3145980; // 0x3000fc field public static final int CHANNEL_OUT_5POINT1POINT4 = 737532; // 0xb40fc + field public static final int CHANNEL_OUT_6POINT1 = 1276; // 0x4fc field @Deprecated public static final int CHANNEL_OUT_7POINT1 = 1020; // 0x3fc field public static final int CHANNEL_OUT_7POINT1POINT2 = 3152124; // 0x3018fc field public static final int CHANNEL_OUT_7POINT1POINT4 = 743676; // 0xb58fc diff --git a/media/java/android/media/AudioFormat.java b/media/java/android/media/AudioFormat.java index d06bbc61f6eb..980accae733b 100644 --- a/media/java/android/media/AudioFormat.java +++ b/media/java/android/media/AudioFormat.java @@ -516,6 +516,9 @@ public final class AudioFormat implements Parcelable { /** Output channel mask for 5.1 */ public static final int CHANNEL_OUT_5POINT1 = (CHANNEL_OUT_FRONT_LEFT | CHANNEL_OUT_FRONT_RIGHT | CHANNEL_OUT_FRONT_CENTER | CHANNEL_OUT_LOW_FREQUENCY | CHANNEL_OUT_BACK_LEFT | CHANNEL_OUT_BACK_RIGHT); + /** Output channel mask for 6.1 + * Same as 5.1 with the addition of the back center channel */ + public static final int CHANNEL_OUT_6POINT1 = (CHANNEL_OUT_5POINT1 | CHANNEL_OUT_BACK_CENTER); /** @hide */ public static final int CHANNEL_OUT_5POINT1_SIDE = (CHANNEL_OUT_FRONT_LEFT | CHANNEL_OUT_FRONT_RIGHT | CHANNEL_OUT_FRONT_CENTER | CHANNEL_OUT_LOW_FREQUENCY | diff --git a/media/java/android/media/audio/common/AidlConversion.java b/media/java/android/media/audio/common/AidlConversion.java index 491a8ec2c130..87634aa37fea 100644 --- a/media/java/android/media/audio/common/AidlConversion.java +++ b/media/java/android/media/audio/common/AidlConversion.java @@ -355,13 +355,7 @@ public class AidlConversion { case AudioChannelLayout.LAYOUT_5POINT1POINT4: return AudioFormat.CHANNEL_OUT_5POINT1POINT4; case AudioChannelLayout.LAYOUT_6POINT1: - return AudioFormat.CHANNEL_OUT_FRONT_LEFT - | AudioFormat.CHANNEL_OUT_FRONT_RIGHT - | AudioFormat.CHANNEL_OUT_FRONT_CENTER - | AudioFormat.CHANNEL_OUT_LOW_FREQUENCY - | AudioFormat.CHANNEL_OUT_BACK_LEFT - | AudioFormat.CHANNEL_OUT_BACK_RIGHT - | AudioFormat.CHANNEL_OUT_BACK_CENTER; + return AudioFormat.CHANNEL_OUT_6POINT1; case AudioChannelLayout.LAYOUT_7POINT1: return AudioFormat.CHANNEL_OUT_7POINT1_SURROUND; case AudioChannelLayout.LAYOUT_7POINT1POINT2: |