diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2011-10-19 11:29:37 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-10-19 11:29:37 -0700 |
| commit | 53d86908dc3e1cb54add568aa6bc325485e3efe5 (patch) | |
| tree | f05d787e3e91a0636796604f4eb3b9139e74f9af /src | |
| parent | 55efc325fc17b911ed1d2a252ea82d995eca2360 (diff) | |
| parent | a9b3f482c555729ee87daa2055eec19f1290e1e0 (diff) | |
| download | packages_apps_LegacyCamera-53d86908dc3e1cb54add568aa6bc325485e3efe5.tar.gz packages_apps_LegacyCamera-53d86908dc3e1cb54add568aa6bc325485e3efe5.tar.bz2 packages_apps_LegacyCamera-53d86908dc3e1cb54add568aa6bc325485e3efe5.zip | |
Merge "Use video capture intent quality when recording with effects." into ics-mr0
Diffstat (limited to 'src')
| -rwxr-xr-x | src/com/android/camera/VideoCamera.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/camera/VideoCamera.java b/src/com/android/camera/VideoCamera.java index 0d63dae3..fa3a9d6e 100755 --- a/src/com/android/camera/VideoCamera.java +++ b/src/com/android/camera/VideoCamera.java @@ -723,8 +723,10 @@ public class VideoCamera extends ActivityBase null); } } else { - // Set quality to 480p for effects - quality = CamcorderProfile.QUALITY_480P; + // Set quality to 480p for effects, unless intent is overriding it + if (!intent.hasExtra(MediaStore.EXTRA_VIDEO_QUALITY)) { + quality = CamcorderProfile.QUALITY_480P; + } // On initial startup, can get here before indicator control is // enabled. In that case, UI quality override handled in // initializeIndicatorControl. |