diff options
| author | 2016-02-24 16:05:03 -0800 | |
|---|---|---|
| committer | 2016-02-26 13:22:52 -0800 | |
| commit | f2615b8b339b812ad6b309d5ec116eb0add320f3 (patch) | |
| tree | 2d43d57fdb17754d4856120a1641d9d774491544 | |
| parent | 46151a4739b0ab9620010b16551e60471c959244 (diff) | |
media: define HEVCProfileMain10HDR10
Bug: 25684127
Change-Id: I9679eaab9b02aeede3e488d33279477a45887b63
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | api/system-current.txt | 1 | ||||
| -rw-r--r-- | api/test-current.txt | 1 | ||||
| -rw-r--r-- | media/java/android/media/MediaCodecInfo.java | 6 |
4 files changed, 7 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index 3240467c1978..2b2c54839ea4 100644 --- a/api/current.txt +++ b/api/current.txt @@ -20631,6 +20631,7 @@ package android.media { field public static final int HEVCMainTierLevel62 = 16777216; // 0x1000000 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 MPEG2LevelH14 = 2; // 0x2 field public static final int MPEG2LevelHL = 3; // 0x3 field public static final int MPEG2LevelLL = 0; // 0x0 diff --git a/api/system-current.txt b/api/system-current.txt index 7dde3902ac32..c7f1e1320a47 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -22131,6 +22131,7 @@ package android.media { field public static final int HEVCMainTierLevel62 = 16777216; // 0x1000000 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 MPEG2LevelH14 = 2; // 0x2 field public static final int MPEG2LevelHL = 3; // 0x3 field public static final int MPEG2LevelLL = 0; // 0x0 diff --git a/api/test-current.txt b/api/test-current.txt index 287f785e63e5..6c2508f06330 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -20640,6 +20640,7 @@ package android.media { field public static final int HEVCMainTierLevel62 = 16777216; // 0x1000000 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 MPEG2LevelH14 = 2; // 0x2 field public static final int MPEG2LevelHL = 3; // 0x3 field public static final int MPEG2LevelLL = 0; // 0x0 diff --git a/media/java/android/media/MediaCodecInfo.java b/media/java/android/media/MediaCodecInfo.java index d9690f005364..b1c1b79732c5 100644 --- a/media/java/android/media/MediaCodecInfo.java +++ b/media/java/android/media/MediaCodecInfo.java @@ -2231,6 +2231,7 @@ public final class MediaCodecInfo { switch (profileLevel.profile) { case CodecProfileLevel.HEVCProfileMain: case CodecProfileLevel.HEVCProfileMain10: + case CodecProfileLevel.HEVCProfileMain10HDR10: break; default: Log.w(TAG, "Unrecognized profile " @@ -2632,8 +2633,9 @@ public final class MediaCodecInfo { public static final int VP9Level62 = 0x1000; // from OMX_VIDEO_HEVCPROFILETYPE - public static final int HEVCProfileMain = 0x01; - public static final int HEVCProfileMain10 = 0x02; + public static final int HEVCProfileMain = 0x01; + public static final int HEVCProfileMain10 = 0x02; + public static final int HEVCProfileMain10HDR10 = 0x1000; // from OMX_VIDEO_HEVCLEVELTYPE public static final int HEVCMainTierLevel1 = 0x1; |