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

Merge "media: Add 8K UHD CamcorderProfile qualities" into sc-dev

Browse Source
This commit is contained in:
Lajos Molnar
2021-02-09 01:33:20 +00:00
committed by Android (Google) Code Review
parent 8d57685bd5 15fe1923eb
commit 084f3be4b1
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/api/current.txt
View File

@@ -20478,6 +20478,7 @@ package android.media {
field public static final int QUALITY_480P = 4; // 0x4 field public static final int QUALITY_480P = 4; // 0x4
field public static final int QUALITY_4KDCI = 10; // 0xa field public static final int QUALITY_4KDCI = 10; // 0xa
field public static final int QUALITY_720P = 5; // 0x5 field public static final int QUALITY_720P = 5; // 0x5
field public static final int QUALITY_8KUHD = 13; // 0xd
field public static final int QUALITY_CIF = 3; // 0x3 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 = 1; // 0x1
field public static final int QUALITY_HIGH_SPEED_1080P = 2004; // 0x7d4 field public static final int QUALITY_HIGH_SPEED_1080P = 2004; // 0x7d4
@@ -20499,6 +20500,7 @@ package android.media {
field public static final int QUALITY_TIME_LAPSE_480P = 1004; // 0x3ec 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_4KDCI = 1010; // 0x3f2
field public static final int QUALITY_TIME_LAPSE_720P = 1005; // 0x3ed field public static final int QUALITY_TIME_LAPSE_720P = 1005; // 0x3ed
field public static final int QUALITY_TIME_LAPSE_8KUHD = 1013; // 0x3f5
field public static final int QUALITY_TIME_LAPSE_CIF = 1003; // 0x3eb 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_HIGH = 1001; // 0x3e9
field public static final int QUALITY_TIME_LAPSE_LOW = 1000; // 0x3e8 field public static final int QUALITY_TIME_LAPSE_LOW = 1000; // 0x3e8

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

@@ -119,9 +119,14 @@ public class CamcorderProfile
*/ */
public static final int QUALITY_2K = 12; public static final int QUALITY_2K = 12;
/**
* Quality level corresponding to 8K UHD (7680 x 4320) resolution
*/
public static final int QUALITY_8KUHD = 13;
// Start and end of quality list // Start and end of quality list
private static final int QUALITY_LIST_START = QUALITY_LOW; private static final int QUALITY_LIST_START = QUALITY_LOW;
private static final int QUALITY_LIST_END = QUALITY_2K; private static final int QUALITY_LIST_END = QUALITY_8KUHD;
/** /**
* Time lapse quality level corresponding to the lowest available resolution. * Time lapse quality level corresponding to the lowest available resolution.
@@ -188,10 +193,14 @@ public class CamcorderProfile
*/ */
public static final int QUALITY_TIME_LAPSE_2K = 1012; public static final int QUALITY_TIME_LAPSE_2K = 1012;
/**
* Time lapse quality level corresponding to the 8K UHD (7680 x 4320) resolution.
*/
public static final int QUALITY_TIME_LAPSE_8KUHD = 1013;
// Start and end of timelapse quality list // Start and end of timelapse quality list
private static final int QUALITY_TIME_LAPSE_LIST_START = QUALITY_TIME_LAPSE_LOW; private static final int QUALITY_TIME_LAPSE_LIST_START = QUALITY_TIME_LAPSE_LOW;
private static final int QUALITY_TIME_LAPSE_LIST_END = QUALITY_TIME_LAPSE_2K; private static final int QUALITY_TIME_LAPSE_LIST_END = QUALITY_TIME_LAPSE_8KUHD;
/** /**
* High speed ( >= 100fps) quality level corresponding to the lowest available resolution. * High speed ( >= 100fps) quality level corresponding to the lowest available resolution.