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

Commit 38cf6b0f authored by Jean-Michel Trivi's avatar Jean-Michel Trivi Committed by android-build-merger
Browse files

Merge "MediaCodecInfo: define AACObjectXHE profile level" into pi-dev 

am: 57e4156e

Change-Id: Ic0c6ef0355ed2d07d7810ddc800f926bfec77f81
parents f73695fb 57e4156e

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -23165,6 +23165,7 @@ package android.media { 
    field public static final int AACObjectMain = 1; // 0x1

    field public static final int AACObjectSSR = 3; // 0x3

    field public static final int AACObjectScalable = 6; // 0x6

    field public static final int AACObjectXHE = 42; // 0x2a

    field public static final int AVCLevel1 = 1; // 0x1

    field public static final int AVCLevel11 = 4; // 0x4

    field public static final int AVCLevel12 = 8; // 0x8

media/java/android/media/MediaCodecInfo.java

+2 −0
Original line number Diff line number Diff line
@@ -2971,6 +2971,8 @@ public final class MediaCodecInfo { 
        public static final int AACObjectLD         = 23;

        public static final int AACObjectHE_PS      = 29;

        public static final int AACObjectELD        = 39;

        /** xHE-AAC (includes USAC) */

        public static final int AACObjectXHE        = 42;



        // from OMX_VIDEO_VP8LEVELTYPE

        public static final int VP8Level_Version0 = 0x01;