Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0a501da3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Replace channel layout for 13.0" into main

parents 58136577 6c12e97d

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -21750,6 +21750,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

media/java/android/media/AudioFormat.java

+5 −3
Original line number Diff line number Diff line
@@ -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:

media/java/android/media/audio/common/AidlConversion.java

+2 −2
Original line number Diff line number Diff line
@@ -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: