diff options
| author | James Dong <jdong@google.com> | 2011-10-27 14:09:50 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-10-27 14:09:50 -0700 |
| commit | 17a5fb36f88d90e30fd656d0d93b540ec2e2b84a (patch) | |
| tree | 17332e1b7cad542fa1d3ffede9d9b274338f2b4a /media | |
| parent | 44c990927c362b26b51c4388f8c51e8c799f9932 (diff) | |
| parent | 33fe290ca33235d7e0988cace14de3319a9a83f1 (diff) | |
| download | frameworks_base-17a5fb36f88d90e30fd656d0d93b540ec2e2b84a.zip frameworks_base-17a5fb36f88d90e30fd656d0d93b540ec2e2b84a.tar.gz frameworks_base-17a5fb36f88d90e30fd656d0d93b540ec2e2b84a.tar.bz2 | |
Merge "Unhide QVGA related resolution profiles and allow to use QVGA resolution for timelapse video recording." into ics-mr1
Diffstat (limited to 'media')
| -rw-r--r-- | media/java/android/media/CamcorderProfile.java | 2 | ||||
| -rw-r--r-- | media/java/android/media/MediaRecorder.java | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/media/java/android/media/CamcorderProfile.java b/media/java/android/media/CamcorderProfile.java index 51a45cd..7d60c55 100644 --- a/media/java/android/media/CamcorderProfile.java +++ b/media/java/android/media/CamcorderProfile.java @@ -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; diff --git a/media/java/android/media/MediaRecorder.java b/media/java/android/media/MediaRecorder.java index 8f5d0e5..2a11d19 100644 --- a/media/java/android/media/MediaRecorder.java +++ b/media/java/android/media/MediaRecorder.java @@ -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 { |