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

am 5ef21e48: Merge "CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P" into lmp-dev

Browse Source 
* commit '5ef21e48b80876178636f3c5936c81409843ff7a':
  CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P
This commit is contained in:
Zhijun He
2014-09-10 07:01:25 +00:00
committed by Android Git Automerger
parent 24d0a48813 350f2552e4
commit 935080433f
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -14420,6 +14420,7 @@ package android.media {
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_720P = 2003; // 0x7d3
field public static final int QUALITY_HIGH_SPEED_HIGH = 2001; // 0x7d1

9
media/java/android/media/CamcorderProfile.java
View File

@@ -177,9 +177,15 @@ public class CamcorderProfile
*/
public static final int QUALITY_HIGH_SPEED_1080P = 2004;
/**
* High speed ( >= 100fps) quality level corresponding to the 2160p (3840 x 2160)
* resolution.
*/
public static final int QUALITY_HIGH_SPEED_2160P = 2005;
// Start and end of high speed quality list
private static final int QUALITY_HIGH_SPEED_LIST_START = QUALITY_HIGH_SPEED_LOW;
private static final int QUALITY_HIGH_SPEED_LIST_END = QUALITY_HIGH_SPEED_1080P;
private static final int QUALITY_HIGH_SPEED_LIST_END = QUALITY_HIGH_SPEED_2160P;
/**
* Default recording duration in seconds before the session is terminated.
@@ -313,6 +319,7 @@ public class CamcorderProfile
* @see #QUALITY_HIGH_SPEED_480P
* @see #QUALITY_HIGH_SPEED_720P
* @see #QUALITY_HIGH_SPEED_1080P
* @see #QUALITY_HIGH_SPEED_2160P
*/
public static CamcorderProfile get(int cameraId, int quality) {
if (!((quality >= QUALITY_LIST_START &&