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

Commit 333c7d36 authored Apr 11, 2016 by Hangyu Kuang Committed by Android (Google) Code Review Apr 11, 2016

Merge "media: update VP9 CodecProfileLevel" into nyc-dev

parents 49a1c083 f0ef572f

api/current.txt

+6 −4

Original line number	Diff line number	Diff line
		@@ -20722,10 +20722,12 @@ package android.media {
		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 VP9Profile0 = 0; // 0x0
		field public static final int VP9Profile1 = 1; // 0x1
		field public static final int VP9Profile2 = 2; // 0x2
		field public static final int VP9Profile3 = 3; // 0x3
		field public static final int VP9Profile0 = 1; // 0x1
		field public static final int VP9Profile1 = 2; // 0x2
		field public static final int VP9Profile2 = 4; // 0x4
		field public static final int VP9Profile2HDR = 4096; // 0x1000
		field public static final int VP9Profile3 = 8; // 0x8
		field public static final int VP9Profile3HDR = 8192; // 0x2000
		field public int level;
		field public int profile;
		}

api/system-current.txt

+6 −4

Original line number	Diff line number	Diff line
		@@ -22203,10 +22203,12 @@ package android.media {
		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 VP9Profile0 = 0; // 0x0
		field public static final int VP9Profile1 = 1; // 0x1
		field public static final int VP9Profile2 = 2; // 0x2
		field public static final int VP9Profile3 = 3; // 0x3
		field public static final int VP9Profile0 = 1; // 0x1
		field public static final int VP9Profile1 = 2; // 0x2
		field public static final int VP9Profile2 = 4; // 0x4
		field public static final int VP9Profile2HDR = 4096; // 0x1000
		field public static final int VP9Profile3 = 8; // 0x8
		field public static final int VP9Profile3HDR = 8192; // 0x2000
		field public int level;
		field public int profile;
		}

api/test-current.txt

+6 −4

Original line number	Diff line number	Diff line
		@@ -20788,10 +20788,12 @@ package android.media {
		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 VP9Profile0 = 0; // 0x0
		field public static final int VP9Profile1 = 1; // 0x1
		field public static final int VP9Profile2 = 2; // 0x2
		field public static final int VP9Profile3 = 3; // 0x3
		field public static final int VP9Profile0 = 1; // 0x1
		field public static final int VP9Profile1 = 2; // 0x2
		field public static final int VP9Profile2 = 4; // 0x4
		field public static final int VP9Profile2HDR = 4096; // 0x1000
		field public static final int VP9Profile3 = 8; // 0x8
		field public static final int VP9Profile3HDR = 8192; // 0x2000
		field public int level;
		field public int profile;
		}

media/java/android/media/MediaCodecInfo.java

+7 −4

Original line number	Diff line number	Diff line
		@@ -2611,10 +2611,13 @@ public final class MediaCodecInfo {
		public static final int VP8ProfileMain = 0x01;

		// from OMX_VIDEO_VP9PROFILETYPE
		public static final int VP9Profile0 = 0x00;
		public static final int VP9Profile1 = 0x01;
		public static final int VP9Profile2 = 0x02;
		public static final int VP9Profile3 = 0x03;
		public static final int VP9Profile0 = 0x01;
		public static final int VP9Profile1 = 0x02;
		public static final int VP9Profile2 = 0x04;
		public static final int VP9Profile3 = 0x08;
		// HDR profiles also support passing HDR metadata
		public static final int VP9Profile2HDR = 0x1000;
		public static final int VP9Profile3HDR = 0x2000;

		// from OMX_VIDEO_VP9LEVELTYPE
		public static final int VP9Level1 = 0x0;