diff --git a/api/current.txt b/api/current.txt index 6d003b87a7e01..3aef4804a165a 100644 --- a/api/current.txt +++ b/api/current.txt @@ -20728,20 +20728,20 @@ package android.media { field public static final int VP8Level_Version2 = 4; // 0x4 field public static final int VP8Level_Version3 = 8; // 0x8 field public static final int VP8ProfileMain = 1; // 0x1 - field public static final int VP9Level1 = 0; // 0x0 - field public static final int VP9Level11 = 1; // 0x1 - field public static final int VP9Level2 = 2; // 0x2 - field public static final int VP9Level21 = 4; // 0x4 - field public static final int VP9Level3 = 8; // 0x8 - field public static final int VP9Level31 = 16; // 0x10 - field public static final int VP9Level4 = 32; // 0x20 - field public static final int VP9Level41 = 64; // 0x40 - field public static final int VP9Level5 = 128; // 0x80 - field public static final int VP9Level51 = 256; // 0x100 - field public static final int VP9Level52 = 512; // 0x200 - field public static final int VP9Level6 = 1024; // 0x400 - field public static final int VP9Level61 = 2048; // 0x800 - field public static final int VP9Level62 = 4096; // 0x1000 + field public static final int VP9Level1 = 1; // 0x1 + field public static final int VP9Level11 = 2; // 0x2 + field public static final int VP9Level2 = 4; // 0x4 + field public static final int VP9Level21 = 8; // 0x8 + field public static final int VP9Level3 = 16; // 0x10 + field public static final int VP9Level31 = 32; // 0x20 + field public static final int VP9Level4 = 64; // 0x40 + field public static final int VP9Level41 = 128; // 0x80 + field public static final int VP9Level5 = 256; // 0x100 + field public static final int VP9Level51 = 512; // 0x200 + field public static final int VP9Level52 = 1024; // 0x400 + field public static final int VP9Level6 = 2048; // 0x800 + field public static final int VP9Level61 = 4096; // 0x1000 + field public static final int VP9Level62 = 8192; // 0x2000 field public static final int VP9Profile0 = 1; // 0x1 field public static final int VP9Profile1 = 2; // 0x2 field public static final int VP9Profile2 = 4; // 0x4 diff --git a/api/system-current.txt b/api/system-current.txt index 211c57bb3d476..af504fe75d25b 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -22248,20 +22248,20 @@ package android.media { field public static final int VP8Level_Version2 = 4; // 0x4 field public static final int VP8Level_Version3 = 8; // 0x8 field public static final int VP8ProfileMain = 1; // 0x1 - field public static final int VP9Level1 = 0; // 0x0 - field public static final int VP9Level11 = 1; // 0x1 - field public static final int VP9Level2 = 2; // 0x2 - field public static final int VP9Level21 = 4; // 0x4 - field public static final int VP9Level3 = 8; // 0x8 - field public static final int VP9Level31 = 16; // 0x10 - field public static final int VP9Level4 = 32; // 0x20 - field public static final int VP9Level41 = 64; // 0x40 - field public static final int VP9Level5 = 128; // 0x80 - field public static final int VP9Level51 = 256; // 0x100 - field public static final int VP9Level52 = 512; // 0x200 - field public static final int VP9Level6 = 1024; // 0x400 - field public static final int VP9Level61 = 2048; // 0x800 - field public static final int VP9Level62 = 4096; // 0x1000 + field public static final int VP9Level1 = 1; // 0x1 + field public static final int VP9Level11 = 2; // 0x2 + field public static final int VP9Level2 = 4; // 0x4 + field public static final int VP9Level21 = 8; // 0x8 + field public static final int VP9Level3 = 16; // 0x10 + field public static final int VP9Level31 = 32; // 0x20 + field public static final int VP9Level4 = 64; // 0x40 + field public static final int VP9Level41 = 128; // 0x80 + field public static final int VP9Level5 = 256; // 0x100 + field public static final int VP9Level51 = 512; // 0x200 + field public static final int VP9Level52 = 1024; // 0x400 + field public static final int VP9Level6 = 2048; // 0x800 + field public static final int VP9Level61 = 4096; // 0x1000 + field public static final int VP9Level62 = 8192; // 0x2000 field public static final int VP9Profile0 = 1; // 0x1 field public static final int VP9Profile1 = 2; // 0x2 field public static final int VP9Profile2 = 4; // 0x4 diff --git a/api/test-current.txt b/api/test-current.txt index e1fb27a55fc8a..6820243e39bd8 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -20796,20 +20796,20 @@ package android.media { field public static final int VP8Level_Version2 = 4; // 0x4 field public static final int VP8Level_Version3 = 8; // 0x8 field public static final int VP8ProfileMain = 1; // 0x1 - field public static final int VP9Level1 = 0; // 0x0 - field public static final int VP9Level11 = 1; // 0x1 - field public static final int VP9Level2 = 2; // 0x2 - field public static final int VP9Level21 = 4; // 0x4 - field public static final int VP9Level3 = 8; // 0x8 - field public static final int VP9Level31 = 16; // 0x10 - field public static final int VP9Level4 = 32; // 0x20 - field public static final int VP9Level41 = 64; // 0x40 - field public static final int VP9Level5 = 128; // 0x80 - field public static final int VP9Level51 = 256; // 0x100 - field public static final int VP9Level52 = 512; // 0x200 - field public static final int VP9Level6 = 1024; // 0x400 - field public static final int VP9Level61 = 2048; // 0x800 - field public static final int VP9Level62 = 4096; // 0x1000 + field public static final int VP9Level1 = 1; // 0x1 + field public static final int VP9Level11 = 2; // 0x2 + field public static final int VP9Level2 = 4; // 0x4 + field public static final int VP9Level21 = 8; // 0x8 + field public static final int VP9Level3 = 16; // 0x10 + field public static final int VP9Level31 = 32; // 0x20 + field public static final int VP9Level4 = 64; // 0x40 + field public static final int VP9Level41 = 128; // 0x80 + field public static final int VP9Level5 = 256; // 0x100 + field public static final int VP9Level51 = 512; // 0x200 + field public static final int VP9Level52 = 1024; // 0x400 + field public static final int VP9Level6 = 2048; // 0x800 + field public static final int VP9Level61 = 4096; // 0x1000 + field public static final int VP9Level62 = 8192; // 0x2000 field public static final int VP9Profile0 = 1; // 0x1 field public static final int VP9Profile1 = 2; // 0x2 field public static final int VP9Profile2 = 4; // 0x4 diff --git a/media/java/android/media/MediaCodecInfo.java b/media/java/android/media/MediaCodecInfo.java index 05e12a1430344..a8c26522f4194 100644 --- a/media/java/android/media/MediaCodecInfo.java +++ b/media/java/android/media/MediaCodecInfo.java @@ -2688,20 +2688,20 @@ public final class MediaCodecInfo { public static final int VP9Profile3HDR = 0x2000; // from OMX_VIDEO_VP9LEVELTYPE - public static final int VP9Level1 = 0x0; - public static final int VP9Level11 = 0x1; - public static final int VP9Level2 = 0x2; - public static final int VP9Level21 = 0x4; - public static final int VP9Level3 = 0x8; - public static final int VP9Level31 = 0x10; - public static final int VP9Level4 = 0x20; - public static final int VP9Level41 = 0x40; - public static final int VP9Level5 = 0x80; - public static final int VP9Level51 = 0x100; - public static final int VP9Level52 = 0x200; - public static final int VP9Level6 = 0x400; - public static final int VP9Level61 = 0x800; - public static final int VP9Level62 = 0x1000; + public static final int VP9Level1 = 0x1; + public static final int VP9Level11 = 0x2; + public static final int VP9Level2 = 0x4; + public static final int VP9Level21 = 0x8; + public static final int VP9Level3 = 0x10; + public static final int VP9Level31 = 0x20; + public static final int VP9Level4 = 0x40; + public static final int VP9Level41 = 0x80; + public static final int VP9Level5 = 0x100; + public static final int VP9Level51 = 0x200; + public static final int VP9Level52 = 0x400; + public static final int VP9Level6 = 0x800; + public static final int VP9Level61 = 0x1000; + public static final int VP9Level62 = 0x2000; // from OMX_VIDEO_HEVCPROFILETYPE public static final int HEVCProfileMain = 0x01;