ImageCapture: separate fillLightMode, redEyeReduction and Torch

media/capture/video/android/java/src/org/chromium/media/VideoCaptureCamera.java

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.media;
 
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.graphics.ImageFormat;
 import android.graphics.Rect;
@@ skipping 522 matching lines @@
         builder.setWhiteBalanceMode(jniWhiteBalanceMode);
 
         builder.setMinColorTemperature(COLOR_TEMPERATURES_MAP.keyAt(0));
         builder.setMaxColorTemperature(
                 COLOR_TEMPERATURES_MAP.keyAt(COLOR_TEMPERATURES_MAP.size() - 1));
         if (jniWhiteBalanceMode == AndroidMeteringMode.FIXED) {
             final int index = COLOR_TEMPERATURES_MAP.indexOfValue(parameters.getWhiteBalance());
             if (index >= 0) builder.setCurrentColorTemperature(COLOR_TEMPERATURES_MAP.keyAt(index));
         }
 
-        if (parameters.getSupportedFlashModes() == null) {
-            builder.setFillLightMode(AndroidFillLightMode.NONE);
-        } else {
-            switch (parameters.getFlashMode()) {
-                case android.hardware.Camera.Parameters.FLASH_MODE_OFF:
-                    builder.setFillLightMode(AndroidFillLightMode.OFF);
-                    break;
-                case android.hardware.Camera.Parameters.FLASH_MODE_AUTO:
-                    builder.setFillLightMode(AndroidFillLightMode.AUTO);
-                    break;
-                case android.hardware.Camera.Parameters.FLASH_MODE_RED_EYE:
-                    builder.setRedEyeReduction(true);
-                    builder.setFillLightMode(AndroidFillLightMode.AUTO);
-                    break;
-                case android.hardware.Camera.Parameters.FLASH_MODE_ON:
-                    builder.setFillLightMode(AndroidFillLightMode.FLASH);
-                    break;
-                case android.hardware.Camera.Parameters.FLASH_MODE_TORCH:
-                    builder.setFillLightMode(AndroidFillLightMode.TORCH);
-                    break;
-                default:
-                    builder.setFillLightMode(AndroidFillLightMode.NONE);
+        final List<String> flashModes = parameters.getSupportedFlashModes();
+        if (flashModes != null) {
+            builder.setTorch(
+                    flashModes.contains(android.hardware.Camera.Parameters.FLASH_MODE_TORCH));
+            builder.setRedEyeReduction(
+                    flashModes.contains(android.hardware.Camera.Parameters.FLASH_MODE_RED_EYE));
+
+            ArrayList<Integer> modes = new ArrayList<Integer>(0);
+            if (flashModes.contains(android.hardware.Camera.Parameters.FLASH_MODE_OFF)) {
+                modes.add(Integer.valueOf(AndroidFillLightMode.OFF));
             }
+            if (flashModes.contains(android.hardware.Camera.Parameters.FLASH_MODE_AUTO)) {
+                modes.add(Integer.valueOf(AndroidFillLightMode.AUTO));
+            }
+            if (flashModes.contains(android.hardware.Camera.Parameters.FLASH_MODE_ON)) {
+                modes.add(Integer.valueOf(AndroidFillLightMode.FLASH));
+            }
+
+            int[] modesAsIntArray = new int[modes.size()];
+            for (int i = 0; i < modes.size(); i++) modesAsIntArray[i] = modes.get(i).intValue();
+            builder.setFillLightModes(modesAsIntArray);

[Reilly Grant (use Gerrit), 2017/03/31 20:13:09]

builder.setFillLightModes(modes.toArray(new int[modes.size()]));

[mcasas, 2017/03/31 21:14:47]

I wish! toArray() would only on ArrayList<Integer>,
there is no direct correspondence between Integer
and int in java-land, and we need int[] for passing
through jni. We could keep an ArrayList<Integer> in
PhotoCapabilities.java, but then we'd need a 
translation like this one over there.

         }
 
         return builder.build();
     }
 
     @Override
     public void setPhotoOptions(double zoom, int focusMode, int exposureMode, double width,
             double height, float[] pointsOfInterest2D, boolean hasExposureCompensation,
             double exposureCompensation, int whiteBalanceMode, double iso,
             boolean hasRedEyeReduction, boolean redEyeReduction, int fillLightMode,
-            double colorTemperature) {
+            boolean hasTorch, boolean torch, double colorTemperature) {
         android.hardware.Camera.Parameters parameters = getCameraParameters(mCamera);
 
         if (parameters.isZoomSupported() && zoom > 0) {
             // |zoomRatios| is an ordered list; need the closest zoom index for parameters.setZoom()
             final List<Integer> zoomRatios = parameters.getZoomRatios();
             int i = 1;
             for (; i < zoomRatios.size(); ++i) {
                 if (zoom < zoomRatios.get(i)) {
                     break;
                 }
@@ skipping 73 matching lines @@
             parameters.setWhiteBalance(android.hardware.Camera.Parameters.WHITE_BALANCE_AUTO);
         } else if (whiteBalanceMode == AndroidMeteringMode.FIXED
                 && parameters.isAutoWhiteBalanceLockSupported()) {
             parameters.setAutoWhiteBalanceLock(true);
             if (colorTemperature > 0.0) {
                 final String closestSetting = getClosestWhiteBalance((int) colorTemperature);
                 if (closestSetting != null) parameters.setWhiteBalance(closestSetting);
             }
         }
 
-        // NONE is only used for getting capabilities, to signify "no flash unit". Ignore it.
         if (parameters.getSupportedFlashModes() != null
-                && fillLightMode != AndroidFillLightMode.NOT_SET
-                && fillLightMode != AndroidFillLightMode.NONE) {
+                && fillLightMode != AndroidFillLightMode.NOT_SET) {
             switch (fillLightMode) {
                 case AndroidFillLightMode.OFF:
                     parameters.setFlashMode(android.hardware.Camera.Parameters.FLASH_MODE_OFF);
                     break;
                 case AndroidFillLightMode.AUTO:
                     parameters.setFlashMode(hasRedEyeReduction && redEyeReduction
                                     ? android.hardware.Camera.Parameters.FLASH_MODE_RED_EYE
                                     : android.hardware.Camera.Parameters.FLASH_MODE_AUTO);
                     break;
                 case AndroidFillLightMode.FLASH:
                     parameters.setFlashMode(android.hardware.Camera.Parameters.FLASH_MODE_ON);
                     break;
-                case AndroidFillLightMode.TORCH:
-                    parameters.setFlashMode(android.hardware.Camera.Parameters.FLASH_MODE_TORCH);
-                    break;
                 default:
             }
+            if (hasTorch && torch) {
+                parameters.setFlashMode(android.hardware.Camera.Parameters.FLASH_MODE_TORCH);
+            }
         }
 
         try {
             mCamera.setParameters(parameters);
         } catch (RuntimeException ex) {
             Log.e(TAG, "setParameters: ", ex);
             return;
         }
 
         if (focusMode != AndroidMeteringMode.SINGLE_SHOT) return;
@@ skipping 91 matching lines @@
                         getCameraRotation());
             }
         } finally {
             mPreviewBufferLock.unlock();
             if (camera != null) {
                 camera.addCallbackBuffer(data);
             }
         }
     }
 }