diff options
| author | Qiwen Zhao <zhao@google.com> | 2014-11-12 13:51:14 -0800 |
|---|---|---|
| committer | Qiwen Zhao <zhao@google.com> | 2014-11-12 13:51:14 -0800 |
| commit | aacce208f76035a8f7453acc66a0b52e3434babd (patch) | |
| tree | 447c248cf7da5821af18fa9fd3a3b531c86afb54 | |
| parent | 52d378bc6bede2c8019134e9c952c14869f226cb (diff) | |
| parent | 90e75d1f90b85e11f6905966ea28d59916935c68 (diff) | |
| download | android_frameworks_ex-aacce208f76035a8f7453acc66a0b52e3434babd.tar.gz android_frameworks_ex-aacce208f76035a8f7453acc66a0b52e3434babd.tar.bz2 android_frameworks_ex-aacce208f76035a8f7453acc66a0b52e3434babd.zip | |
Merge commit '90e75d1f90b85e11f6905966ea28d59916935c68' into lmp-mr1-dev
| -rw-r--r-- | camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraCapabilities.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraCapabilities.java b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraCapabilities.java index 84b44e6..9892d4a 100644 --- a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraCapabilities.java +++ b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraCapabilities.java @@ -47,7 +47,6 @@ class AndroidCameraCapabilities extends CameraCapabilities { mPreferredPreviewSizeForVideo = new Size(p.getPreferredPreviewSizeForVideo()); mSupportedPreviewFormats.addAll(p.getSupportedPreviewFormats()); mSupportedPhotoFormats.addAll(p.getSupportedPictureFormats()); - mMaxZoomRatio = p.getZoomRatios().get(p.getMaxZoom()) / ZOOM_MULTIPLIER; mHorizontalViewAngle = p.getHorizontalViewAngle(); mVerticalViewAngle = p.getVerticalViewAngle(); buildPreviewFpsRange(p); @@ -60,6 +59,7 @@ class AndroidCameraCapabilities extends CameraCapabilities { buildWhiteBalances(p); if (p.isZoomSupported()) { + mMaxZoomRatio = p.getZoomRatios().get(p.getMaxZoom()) / ZOOM_MULTIPLIER; mSupportedFeatures.add(Feature.ZOOM); } if (p.isVideoSnapshotSupported()) { |