Merge "Unhide some camera recording constants." (68e23e17) · Commits · e / os / android_frameworks_base

api/current.txt

+11 −0

Original line number	Diff line number	Diff line
		@@ -24399,28 +24399,39 @@ package android.media {
		method public static boolean hasProfile(int, int);
		field public static final int QUALITY_1080P = 6; // 0x6
		field public static final int QUALITY_2160P = 8; // 0x8
		field public static final int QUALITY_2K = 12; // 0xc
		field public static final int QUALITY_480P = 4; // 0x4
		field public static final int QUALITY_4KDCI = 10; // 0xa
		field public static final int QUALITY_720P = 5; // 0x5
		field public static final int QUALITY_CIF = 3; // 0x3
		field public static final int QUALITY_HIGH = 1; // 0x1
		field public static final int QUALITY_HIGH_SPEED_1080P = 2004; // 0x7d4
		field public static final int QUALITY_HIGH_SPEED_2160P = 2005; // 0x7d5
		field public static final int QUALITY_HIGH_SPEED_480P = 2002; // 0x7d2
		field public static final int QUALITY_HIGH_SPEED_4KDCI = 2008; // 0x7d8
		field public static final int QUALITY_HIGH_SPEED_720P = 2003; // 0x7d3
		field public static final int QUALITY_HIGH_SPEED_CIF = 2006; // 0x7d6
		field public static final int QUALITY_HIGH_SPEED_HIGH = 2001; // 0x7d1
		field public static final int QUALITY_HIGH_SPEED_LOW = 2000; // 0x7d0
		field public static final int QUALITY_HIGH_SPEED_VGA = 2007; // 0x7d7
		field public static final int QUALITY_LOW = 0; // 0x0
		field public static final int QUALITY_QCIF = 2; // 0x2
		field public static final int QUALITY_QHD = 11; // 0xb
		field public static final int QUALITY_QVGA = 7; // 0x7
		field public static final int QUALITY_TIME_LAPSE_1080P = 1006; // 0x3ee
		field public static final int QUALITY_TIME_LAPSE_2160P = 1008; // 0x3f0
		field public static final int QUALITY_TIME_LAPSE_2K = 1012; // 0x3f4
		field public static final int QUALITY_TIME_LAPSE_480P = 1004; // 0x3ec
		field public static final int QUALITY_TIME_LAPSE_4KDCI = 1010; // 0x3f2
		field public static final int QUALITY_TIME_LAPSE_720P = 1005; // 0x3ed
		field public static final int QUALITY_TIME_LAPSE_CIF = 1003; // 0x3eb
		field public static final int QUALITY_TIME_LAPSE_HIGH = 1001; // 0x3e9
		field public static final int QUALITY_TIME_LAPSE_LOW = 1000; // 0x3e8
		field public static final int QUALITY_TIME_LAPSE_QCIF = 1002; // 0x3ea
		field public static final int QUALITY_TIME_LAPSE_QHD = 1011; // 0x3f3
		field public static final int QUALITY_TIME_LAPSE_QVGA = 1007; // 0x3ef
		field public static final int QUALITY_TIME_LAPSE_VGA = 1009; // 0x3f1
		field public static final int QUALITY_VGA = 9; // 0x9
		field public int audioBitRate;
		field public int audioChannels;
		field public int audioCodec;

media/java/android/media/CamcorderProfile.java

+0 −11

Original line number	Diff line number	Diff line
		@@ -99,25 +99,21 @@ public class CamcorderProfile

		/**
		* Quality level corresponding to the VGA (640 x 480) resolution.
		* @hide
		*/
		public static final int QUALITY_VGA = 9;

		/**
		* Quality level corresponding to 4k-DCI (4096 x 2160) resolution.
		* @hide
		*/
		public static final int QUALITY_4KDCI = 10;

		/**
		* Quality level corresponding to QHD (2560 x 1440) resolution
		* @hide
		*/
		public static final int QUALITY_QHD = 11;

		/**
		* Quality level corresponding to 2K (2048 x 1080) resolution
		* @hide
		*/
		public static final int QUALITY_2K = 12;

		@@ -172,25 +168,21 @@ public class CamcorderProfile

		/**
		* Time lapse quality level corresponding to the VGA (640 x 480) resolution.
		* @hide
		*/
		public static final int QUALITY_TIME_LAPSE_VGA = 1009;

		/**
		* Time lapse quality level corresponding to the 4k-DCI (4096 x 2160) resolution.
		* @hide
		*/
		public static final int QUALITY_TIME_LAPSE_4KDCI = 1010;

		/**
		* Time lapse quality level corresponding to the QHD (2560 x 1440) resolution.
		* @hide
		*/
		public static final int QUALITY_TIME_LAPSE_QHD = 1011;

		/**
		* Time lapse quality level corresponding to the 2K (2048 x 1080) resolution.
		* @hide
		*/
		public static final int QUALITY_TIME_LAPSE_2K = 1012;

		@@ -255,19 +247,16 @@ public class CamcorderProfile

		/**
		* High speed ( >= 100fps) quality level corresponding to the CIF (352 x 288)
		* @hide
		*/
		public static final int QUALITY_HIGH_SPEED_CIF = 2006;

		/**
		* High speed ( >= 100fps) quality level corresponding to the VGA (640 x 480)
		* @hide
		*/
		public static final int QUALITY_HIGH_SPEED_VGA = 2007;

		/**
		* High speed ( >= 100fps) quality level corresponding to the 4K-DCI (4096 x 2160)
		* @hide
		*/
		public static final int QUALITY_HIGH_SPEED_4KDCI = 2008;