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

Commit 17a5fb36 authored by James Dong's avatar James Dong Committed by Android (Google) Code Review
Browse files

Merge "Unhide QVGA related resolution profiles and allow to use QVGA... 

Merge "Unhide QVGA related resolution profiles and allow to use QVGA resolution for timelapse video recording." into ics-mr1
parents 44c99092 33fe290c

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -10537,6 +10537,7 @@ package android.media { 
    field public static final int QUALITY_HIGH = 1; // 0x1

    field public static final int QUALITY_LOW = 0; // 0x0

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

    field public static final int QUALITY_TIME_LAPSE_720P = 1005; // 0x3ed
@@ -10544,6 +10545,7 @@ package android.media { 
    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_QVGA = 1007; // 0x3ef

    field public int audioBitRate;

    field public int audioChannels;

    field public int audioCodec;

media/java/android/media/CamcorderProfile.java

+0 −2
Original line number Diff line number Diff line
@@ -82,7 +82,6 @@ public class CamcorderProfile 


    /**

     * Quality level corresponding to the QVGA (320x240) resolution.

     * {@hide}

     */

    public static final int QUALITY_QVGA = 7;
@@ -127,7 +126,6 @@ public class CamcorderProfile 


    /**

     * Time lapse quality level corresponding to the QVGA (320 x 240) resolution.

     * {@hide}

     */

    public static final int QUALITY_TIME_LAPSE_QVGA = 1007;

media/java/android/media/MediaRecorder.java

+1 −1
Original line number Diff line number Diff line
@@ -299,7 +299,7 @@ public class MediaRecorder 
        setVideoEncodingBitRate(profile.videoBitRate);

        setVideoEncoder(profile.videoCodec);

        if (profile.quality >= CamcorderProfile.QUALITY_TIME_LAPSE_LOW &&

             profile.quality <= CamcorderProfile.QUALITY_TIME_LAPSE_1080P) {

             profile.quality <= CamcorderProfile.QUALITY_TIME_LAPSE_QVGA) {

            // Enable time lapse. Also don't set audio for time lapse.

            setParameter(String.format("time-lapse-enable=1"));

        } else {