ImageCapture: separate fillLightMode, redEyeReduction and Torch

media/capture/video/android/java/src/org/chromium/media/VideoCapture.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.content.Context;
 import android.graphics.ImageFormat;
 import android.view.Surface;
 import android.view.WindowManager;
@@ skipping 54 matching lines @@
     @CalledByNative
     public abstract boolean startCapture();
 
     @CalledByNative
     public abstract boolean stopCapture();
 
     @CalledByNative
     public abstract PhotoCapabilities getPhotoCapabilities();
 
     /**
-    * @param zoom Zoom level, should be ignored if 0.
-    * @param focusMode Focus mode following AndroidMeteringMode enum.
-    * @param exposureMode Exposure mode following AndroidMeteringMode enum.
-    * @param pointsOfInterest2D 2D normalized points of interest, marshalled with
-    * x coordinate first followed by the y coordinate.
-    * @param hasExposureCompensation Indicates if |exposureCompensation| is set.
-    * @param exposureCompensation Adjustment to auto exposure. 0 means not adjusted.
-    * @param whiteBalanceMode White Balance mode following AndroidMeteringMode enum.
-    * @param iso Sensitivity to light. 0, which would be invalid, means ignore.
-    * @param hasRedEyeReduction Indicates if |redEyeReduction| is set.
-    * @param redEyeReduction Value of red eye reduction for the auto flash setting.
-    * @param fillLightMode Flash/Torch setting, following AndroidFillLightMode enum.
-    * @param colorTemperature White Balance reference temperature, valid if whiteBalanceMode is
-    * manual, and its value is larger than 0.
-    */
+     * @param zoom Zoom level, should be ignored if 0.
+     * @param focusMode Focus mode following AndroidMeteringMode enum.
+     * @param exposureMode Exposure mode following AndroidMeteringMode enum.
+     * @param pointsOfInterest2D 2D normalized points of interest, marshalled with
+     * x coordinate first followed by the y coordinate.
+     * @param hasExposureCompensation Indicates if |exposureCompensation| is set.
+     * @param exposureCompensation Adjustment to auto exposure. 0 means not adjusted.
+     * @param whiteBalanceMode White Balance mode following AndroidMeteringMode enum.
+     * @param iso Sensitivity to light. 0, which would be invalid, means ignore.
+     * @param hasRedEyeReduction Indicates if |redEyeReduction| is set.
+     * @param redEyeReduction Value of red eye reduction for the auto flash setting.
+     * @param fillLightMode Flash setting, following AndroidFillLightMode enum.
+     * @param colorTemperature White Balance reference temperature, valid if whiteBalanceMode is
+     * manual, and its value is larger than 0.
+     * @param torch Torch setting, true meaning on.
+     */
     @CalledByNative
     public abstract 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);
 
     @CalledByNative
     public abstract boolean takePhoto(final long callbackId);
 
     @CalledByNative
     public abstract void deallocate();
 
     @CalledByNative
     public final int queryWidth() {
         return mCaptureFormat.mWidth;
@@ skipping 115 matching lines @@
     // Method for VideoCapture implementations to signal an asynchronous error.
     public native void nativeOnError(long nativeVideoCaptureDeviceAndroid, String message);
 
     // Method for VideoCapture implementations to send Photos back to.
     public native void nativeOnPhotoTaken(
             long nativeVideoCaptureDeviceAndroid, long callbackId, byte[] data);
 
     // Method for VideoCapture implementations to report device started event.
     public native void nativeOnStarted(long nativeVideoCaptureDeviceAndroid);
 }