Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "media: Change VP9 ProfileLevel to start from 0x1." into nyc-dev am: a516aea

Browse Source 
am: 573042aab2

* commit '573042aab2019b314a882ce094d201298c6f4c5a':
  media: Change VP9 ProfileLevel to start from 0x1.

Change-Id: I1008203b45b87f83b69a289a32301c58f601ac14
This commit is contained in:
Hangyu Kuang
2016-04-28 19:25:06 +00:00
committed by android-build-merger
parent 206aa131da 573042aab2
commit 94f562671c
4 changed files with 56 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
api/current.txt
View File

@@ -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

28
api/system-current.txt
View File

@@ -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

28
api/test-current.txt
View File

@@ -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

28
media/java/android/media/MediaCodecInfo.java
View File

@@ -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;