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

Commit e7dd66d7 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Updates to Dolby Vision Levels"

parents c428b10a cd7a2e2c

core/api/current.txt

+3 −0
Original line number Original line Diff line number Diff line
@@ -20724,11 +20724,14 @@ package android.media { 
    field public static final int AVCProfileHigh422 = 32; // 0x20

    field public static final int AVCProfileHigh422 = 32; // 0x20

    field public static final int AVCProfileHigh444 = 64; // 0x40

    field public static final int AVCProfileHigh444 = 64; // 0x40

    field public static final int AVCProfileMain = 2; // 0x2

    field public static final int AVCProfileMain = 2; // 0x2

    field public static final int DolbyVisionLevel8k30 = 1024; // 0x400

    field public static final int DolbyVisionLevel8k60 = 2048; // 0x800

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

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

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

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

    field public static final int DolbyVisionLevelFhd60 = 16; // 0x10

    field public static final int DolbyVisionLevelFhd60 = 16; // 0x10

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

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

    field public static final int DolbyVisionLevelHd30 = 2; // 0x2

    field public static final int DolbyVisionLevelHd30 = 2; // 0x2

    field public static final int DolbyVisionLevelUhd120 = 512; // 0x200

    field public static final int DolbyVisionLevelUhd24 = 32; // 0x20

    field public static final int DolbyVisionLevelUhd24 = 32; // 0x20

    field public static final int DolbyVisionLevelUhd30 = 64; // 0x40

    field public static final int DolbyVisionLevelUhd30 = 64; // 0x40

    field public static final int DolbyVisionLevelUhd48 = 128; // 0x80

    field public static final int DolbyVisionLevelUhd48 = 128; // 0x80

media/java/android/media/MediaCodecInfo.java

+6 −0
Original line number Original line Diff line number Diff line
@@ -4025,6 +4025,12 @@ public final class MediaCodecInfo { 
        public static final int DolbyVisionLevelUhd30   = 0x40;

        public static final int DolbyVisionLevelUhd30   = 0x40;

        public static final int DolbyVisionLevelUhd48   = 0x80;

        public static final int DolbyVisionLevelUhd48   = 0x80;

        public static final int DolbyVisionLevelUhd60   = 0x100;

        public static final int DolbyVisionLevelUhd60   = 0x100;

        @SuppressLint("AllUpper")

        public static final int DolbyVisionLevelUhd120  = 0x200;

        @SuppressLint("AllUpper")

        public static final int DolbyVisionLevel8k30    = 0x400;

        @SuppressLint("AllUpper")

        public static final int DolbyVisionLevel8k60    = 0x800;





        // Profiles and levels for AV1 Codec, corresponding to the definitions in

        // Profiles and levels for AV1 Codec, corresponding to the definitions in

        // "AV1 Bitstream & Decoding Process Specification", Annex A

        // "AV1 Bitstream & Decoding Process Specification", Annex A