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

Commit f65d9e23 authored by Chong Zhang's avatar Chong Zhang Committed by android-build-merger
Browse files

Merge "heif: add definition for HEVC Main Still Picture profile" into pi-dev am: f78a08c2 

am: 48676f19

Change-Id: Ib795e7b2d64e83d567ae271550dd116483dfe09a
parents 460ec368 48676f19

api/current.txt

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

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

    field public static final int HEVCProfileMain10HDR10 = 4096; // 0x1000

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

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

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

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

media/java/android/media/MediaCodecInfo.java

+1 −0
Original line number Diff line number Diff line
@@ -3009,6 +3009,7 @@ public final class MediaCodecInfo { 
        // from OMX_VIDEO_HEVCPROFILETYPE

        public static final int HEVCProfileMain        = 0x01;

        public static final int HEVCProfileMain10      = 0x02;

        public static final int HEVCProfileMainStill   = 0x04;

        public static final int HEVCProfileMain10HDR10 = 0x1000;



        // from OMX_VIDEO_HEVCLEVELTYPE