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

Commit 5f0d640c authored by Zhijun He's avatar Zhijun He Committed by Android (Google) Code Review
Browse files

Merge "CamcorderProfiles: Add 4K video constants"

parents e37da759 e414608c

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -13918,6 +13918,7 @@ package android.media { 
    method public static boolean hasProfile(int);

    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_480P = 4; // 0x4

    field public static final int QUALITY_720P = 5; // 0x5

    field public static final int QUALITY_CIF = 3; // 0x3
@@ -13926,6 +13927,7 @@ package android.media { 
    field public static final int QUALITY_QCIF = 2; // 0x2

    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_480P = 1004; // 0x3ec

    field public static final int QUALITY_TIME_LAPSE_720P = 1005; // 0x3ed

    field public static final int QUALITY_TIME_LAPSE_CIF = 1003; // 0x3eb

media/java/android/media/CamcorderProfile.java

+12 −2
Original line number Diff line number Diff line
@@ -90,9 +90,14 @@ public class CamcorderProfile 
     */

    public static final int QUALITY_QVGA = 7;



    /**

     * Quality level corresponding to the 2160p (3840x2160) resolution.

     */

    public static final int QUALITY_2160P = 8;



    // Start and end of quality list

    private static final int QUALITY_LIST_START = QUALITY_LOW;

    private static final int QUALITY_LIST_END = QUALITY_QVGA;

    private static final int QUALITY_LIST_END = QUALITY_2160P;



    /**

     * Time lapse quality level corresponding to the lowest available resolution.
@@ -134,9 +139,14 @@ public class CamcorderProfile 
     */

    public static final int QUALITY_TIME_LAPSE_QVGA = 1007;



    /**

     * Time lapse quality level corresponding to the 2160p (3840 x 2160) resolution.

     */

    public static final int QUALITY_TIME_LAPSE_2160P = 1008;



    // 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_END = QUALITY_TIME_LAPSE_QVGA;

    private static final int QUALITY_TIME_LAPSE_LIST_END = QUALITY_TIME_LAPSE_2160P;



    /**

     * Default recording duration in seconds before the session is terminated.