camera2-portability: Switch to ratio-based zoom interfaces

This eliminates the deprecated index-based CameraSettings zoom methods in favor
of floating-point ratio based versions, and includes the plumbing to make those
work for both the camera1 and camera2 underlying framework APIs.

Bug: 17016658
Change-Id: I0567a53cd57bfa6d53604e3c5457a39ef49e3cb4

1 files changed, 4 insertions, 3 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 acff9c6..84b44e6 100644
--- a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraCapabilities.java
+++ b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraCapabilities.java
@@ -31,6 +31,9 @@ class AndroidCameraCapabilities extends CameraCapabilities {
 
     private static Log.Tag TAG = new Log.Tag("AndCamCapabs");
 
+    /** Conversion from ratios to percentages. */
+    public static final float ZOOM_MULTIPLIER = 100f;
+
     private FpsComparator mFpsComparator = new FpsComparator();
     private SizeComparator mSizeComparator = new SizeComparator();
 
@@ -44,9 +47,7 @@ class AndroidCameraCapabilities extends CameraCapabilities {
         mPreferredPreviewSizeForVideo = new Size(p.getPreferredPreviewSizeForVideo());
         mSupportedPreviewFormats.addAll(p.getSupportedPreviewFormats());
         mSupportedPhotoFormats.addAll(p.getSupportedPictureFormats());
-        mMaxZoomIndex = p.getMaxZoom();
-        mZoomRatioList.addAll(p.getZoomRatios());
-        mMaxZoomRatio = mZoomRatioList.get(mMaxZoomIndex);
+        mMaxZoomRatio = p.getZoomRatios().get(p.getMaxZoom()) / ZOOM_MULTIPLIER;
         mHorizontalViewAngle = p.getHorizontalViewAngle();
         mVerticalViewAngle = p.getVerticalViewAngle();
         buildPreviewFpsRange(p);