diff options
| -rw-r--r-- | core/api/current.txt | 1 | ||||
| -rw-r--r-- | media/java/android/media/AudioFormat.java | 8 | ||||
| -rw-r--r-- | media/java/android/media/audio/common/AidlConversion.java | 4 |
3 files changed, 8 insertions, 5 deletions
diff --git a/core/api/current.txt b/core/api/current.txt index 6964866db7f3..c4ad38442a34 100644 --- a/core/api/current.txt +++ b/core/api/current.txt @@ -21749,6 +21749,7 @@ package android.media { field public static final int CHANNEL_IN_X_AXIS = 2048; // 0x800 field public static final int CHANNEL_IN_Y_AXIS = 4096; // 0x1000 field public static final int CHANNEL_IN_Z_AXIS = 8192; // 0x2000 + field @FlaggedApi("android.media.audio.sony_360ra_mpegh_3d_format") public static final int CHANNEL_OUT_13POINT0 = 30136348; // 0x1cbd81c 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 diff --git a/media/java/android/media/AudioFormat.java b/media/java/android/media/AudioFormat.java index 8bc66a048d27..f308ce953680 100644 --- a/media/java/android/media/AudioFormat.java +++ b/media/java/android/media/AudioFormat.java @@ -18,6 +18,7 @@ package android.media; import static android.media.audio.Flags.FLAG_DOLBY_AC4_LEVEL4_ENCODING_API; import static android.media.audio.Flags.FLAG_IAMF_DEFINITIONS_API; +import static android.media.audio.Flags.FLAG_SONY_360RA_MPEGH_3D_FORMAT; import android.annotation.FlaggedApi; import android.annotation.IntDef; @@ -718,8 +719,9 @@ public final class AudioFormat implements Parcelable { * Same as 9.1.4 with the addition of left and right top side channels */ public static final int CHANNEL_OUT_9POINT1POINT6 = (CHANNEL_OUT_9POINT1POINT4 | CHANNEL_OUT_TOP_SIDE_LEFT | CHANNEL_OUT_TOP_SIDE_RIGHT); - /** @hide */ - public static final int CHANNEL_OUT_13POINT_360RA = ( + /** Output channel mask for 13.0 */ + @FlaggedApi(FLAG_SONY_360RA_MPEGH_3D_FORMAT) + public static final int CHANNEL_OUT_13POINT0 = ( 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 | @@ -915,7 +917,7 @@ public final class AudioFormat implements Parcelable { case CHANNEL_OUT_9POINT1POINT6: result.append("9.1.6"); break; - case CHANNEL_OUT_13POINT_360RA: + case CHANNEL_OUT_13POINT0: result.append("360RA 13ch"); break; case CHANNEL_OUT_22POINT2: diff --git a/media/java/android/media/audio/common/AidlConversion.java b/media/java/android/media/audio/common/AidlConversion.java index 8521d1c472a8..b831e4f83e02 100644 --- a/media/java/android/media/audio/common/AidlConversion.java +++ b/media/java/android/media/audio/common/AidlConversion.java @@ -366,8 +366,8 @@ public class AidlConversion { return AudioFormat.CHANNEL_OUT_9POINT1POINT4; case AudioChannelLayout.LAYOUT_9POINT1POINT6: return AudioFormat.CHANNEL_OUT_9POINT1POINT6; - case AudioChannelLayout.LAYOUT_13POINT_360RA: - return AudioFormat.CHANNEL_OUT_13POINT_360RA; + case AudioChannelLayout.LAYOUT_13POINT0: + return AudioFormat.CHANNEL_OUT_13POINT0; case AudioChannelLayout.LAYOUT_22POINT2: return AudioFormat.CHANNEL_OUT_22POINT2; case AudioChannelLayout.LAYOUT_MONO_HAPTIC_A: |