am 53d86908: Merge "Use video capture intent quality when recording with effects." into ics-mr0

* commit '53d86908dc3e1cb54add568aa6bc325485e3efe5':
  Use video capture intent quality when recording with effects.

1 files changed, 4 insertions, 2 deletions

diff --git a/src/com/android/camera/VideoCamera.java b/src/com/android/camera/VideoCamera.java
index 092c76b..267a95e 100755
--- a/src/com/android/camera/VideoCamera.java
+++ b/src/com/android/camera/VideoCamera.java
@@ -722,8 +722,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.