Image Capture Android: make torch mode override other fill light mode(s)

media/capture/video/android/java/src/org/chromium/media/VideoCaptureCamera2.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 372 matching lines @@
             // We need to configure by hand the exposure time when AE mode is off.  Set it to the
             // middle of the allowed range. Further tuning will be done via |mIso|.
             final CameraCharacteristics cameraCharacteristics =
                     getCameraCharacteristics(mContext, mId);
             Range<Long> range = cameraCharacteristics.get(
                     CameraCharacteristics.SENSOR_INFO_EXPOSURE_TIME_RANGE);
             requestBuilder.set(CaptureRequest.SENSOR_EXPOSURE_TIME,
                     range.getLower() + (range.getUpper() + range.getLower()) / 2 /* nanoseconds*/);
 
         } else {
+            requestBuilder.set(CaptureRequest.CONTROL_MODE, CaptureRequest.CONTROL_MODE_AUTO);
             requestBuilder.set(CaptureRequest.CONTROL_AE_MODE, CameraMetadata.CONTROL_AE_MODE_ON);
             requestBuilder.set(CaptureRequest.CONTROL_AE_TARGET_FPS_RANGE, mAeFpsRange);
         }
-        switch (mFillLightMode) {
-            case AndroidFillLightMode.OFF:
-                requestBuilder.set(CaptureRequest.FLASH_MODE, CameraMetadata.FLASH_MODE_OFF);
-                break;
-            case AndroidFillLightMode.AUTO:
-                // Setting the AE to CONTROL_AE_MODE_ON_AUTO_FLASH[_REDEYE] overrides FLASH_MODE.
-                requestBuilder.set(CaptureRequest.CONTROL_AE_MODE, mRedEyeReduction
-                                ? CameraMetadata.CONTROL_AE_MODE_ON_AUTO_FLASH_REDEYE
-                                : CameraMetadata.CONTROL_AE_MODE_ON_AUTO_FLASH);
-                break;
-            case AndroidFillLightMode.FLASH:
-                // Setting the AE to CONTROL_AE_MODE_ON_ALWAYS_FLASH overrides FLASH_MODE.
-                requestBuilder.set(CaptureRequest.CONTROL_AE_MODE,
-                        CameraMetadata.CONTROL_AE_MODE_ON_ALWAYS_FLASH);
-                break;
-            default:
+
+        if (mTorch) {
+            requestBuilder.set(CaptureRequest.CONTROL_AE_MODE,
+                    mExposureMode == AndroidMeteringMode.CONTINUOUS
+                            ? CameraMetadata.CONTROL_AE_MODE_ON
+                            : CameraMetadata.CONTROL_AE_MODE_OFF);
+            requestBuilder.set(CaptureRequest.FLASH_MODE, CameraMetadata.FLASH_MODE_TORCH);
+        } else {
+            switch (mFillLightMode) {
+                case AndroidFillLightMode.OFF:
+                    requestBuilder.set(CaptureRequest.FLASH_MODE, CameraMetadata.FLASH_MODE_OFF);
+                    break;
+                case AndroidFillLightMode.AUTO:
+                    // Setting the AE to CONTROL_AE_MODE_ON_AUTO_FLASH[_REDEYE] overrides
+                    // FLASH_MODE.
+                    requestBuilder.set(CaptureRequest.CONTROL_AE_MODE,
+                            mRedEyeReduction ? CameraMetadata.CONTROL_AE_MODE_ON_AUTO_FLASH_REDEYE
+                                             : CameraMetadata.CONTROL_AE_MODE_ON_AUTO_FLASH);
+                    break;
+                case AndroidFillLightMode.FLASH:
+                    // Setting the AE to CONTROL_AE_MODE_ON_ALWAYS_FLASH overrides FLASH_MODE.
+                    requestBuilder.set(CaptureRequest.CONTROL_AE_MODE,
+                            CameraMetadata.CONTROL_AE_MODE_ON_ALWAYS_FLASH);
+                    requestBuilder.set(CaptureRequest.FLASH_MODE, CameraMetadata.FLASH_MODE_SINGLE);
+                    break;
+                default:
+            }
+            requestBuilder.set(CaptureRequest.CONTROL_AE_PRECAPTURE_TRIGGER,
+                    CaptureRequest.CONTROL_AE_PRECAPTURE_TRIGGER_IDLE);
         }
-        if (mTorch) requestBuilder.set(CaptureRequest.FLASH_MODE, CameraMetadata.FLASH_MODE_TORCH);
 
         requestBuilder.set(CaptureRequest.CONTROL_AE_EXPOSURE_COMPENSATION, mExposureCompensation);
 
         // White Balance mode AndroidMeteringMode.SINGLE_SHOT is not supported.
         if (mWhiteBalanceMode == AndroidMeteringMode.CONTINUOUS) {
             requestBuilder.set(CaptureRequest.CONTROL_AWB_LOCK, false);
             requestBuilder.set(
                     CaptureRequest.CONTROL_AWB_MODE, CameraMetadata.CONTROL_AWB_MODE_AUTO);
             // TODO(mcasas): support different luminant color temperatures, e.g. DAYLIGHT, SHADE.
             // https://crbug.com/518807
@@ skipping 618 matching lines @@
             return false;
         }
         return true;
     }
 
     @Override
     public void deallocate() {
         Log.d(TAG, "deallocate");
     }
 }