ImageCapture: separate fillLightMode, redEyeReduction and Torch

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

 // Copyright 2016 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 org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
 
 /**
@@ skipping 17 matching lines @@
     public final double minZoom;
     public final double currentZoom;
     public final double stepZoom;
     public final int focusMode;
     public final int exposureMode;
     public final double maxExposureCompensation;
     public final double minExposureCompensation;
     public final double currentExposureCompensation;
     public final double stepExposureCompensation;
     public final int whiteBalanceMode;
-    public final int fillLightMode;
+    public final int[] fillLightModes;
+    public final boolean torch;
     public final boolean redEyeReduction;
     public final int maxColorTemperature;
     public final int minColorTemperature;
     public final int currentColorTemperature;
     public final int stepColorTemperature;
 
     PhotoCapabilities(int maxIso, int minIso, int currentIso, int stepIso, int maxHeight,
             int minHeight, int currentHeight, int stepHeight, int maxWidth, int minWidth,
             int currentWidth, int stepWidth, double maxZoom, double minZoom, double currentZoom,
             double stepZoom, int focusMode, int exposureMode, double maxExposureCompensation,
             double minExposureCompensation, double currentExposureCompensation,
-            double stepExposureCompensation, int whiteBalanceMode, int fillLightMode,
-            boolean redEyeReduction, int maxColorTemperature, int minColorTemperature,
-            int currentColorTemperature, int stepColorTemperature) {
+            double stepExposureCompensation, int whiteBalanceMode, int[] fillLightModes,
+            boolean torch, boolean redEyeReduction, int maxColorTemperature,
+            int minColorTemperature, int currentColorTemperature, int stepColorTemperature) {
         this.maxIso = maxIso;
         this.minIso = minIso;
         this.currentIso = currentIso;
         this.stepIso = stepIso;
         this.maxHeight = maxHeight;
         this.minHeight = minHeight;
         this.currentHeight = currentHeight;
         this.stepHeight = stepHeight;
         this.maxWidth = maxWidth;
         this.minWidth = minWidth;
         this.currentWidth = currentWidth;
         this.stepWidth = stepWidth;
         this.maxZoom = maxZoom;
         this.minZoom = minZoom;
         this.currentZoom = currentZoom;
         this.stepZoom = stepZoom;
         this.focusMode = focusMode;
         this.exposureMode = exposureMode;
         this.maxExposureCompensation = maxExposureCompensation;
         this.minExposureCompensation = minExposureCompensation;
         this.currentExposureCompensation = currentExposureCompensation;
         this.stepExposureCompensation = stepExposureCompensation;
         this.whiteBalanceMode = whiteBalanceMode;
-        this.fillLightMode = fillLightMode;
+        this.fillLightModes = fillLightModes;
+        this.torch = torch;
         this.redEyeReduction = redEyeReduction;
         this.maxColorTemperature = maxColorTemperature;
         this.minColorTemperature = minColorTemperature;
         this.currentColorTemperature = currentColorTemperature;
         this.stepColorTemperature = stepColorTemperature;
     }
 
     @CalledByNative
     public int getMinIso() {
         return minIso;
@@ skipping 103 matching lines @@
     public double getStepExposureCompensation() {
         return stepExposureCompensation;
     }
 
     @CalledByNative
     public int getWhiteBalanceMode() {
         return whiteBalanceMode;
     }
 
     @CalledByNative
-    public int getFillLightMode() {
-        return fillLightMode;
+    public int[] getFillLightModes() {
+        return (fillLightModes != null) ? fillLightModes.clone() : new int[0];
     }
 
     @CalledByNative
+    public boolean getTorch() {
+        return torch;
+    }
+
+    @CalledByNative
     public boolean getRedEyeReduction() {
         return redEyeReduction;
     }
 
     @CalledByNative
     public int getMinColorTemperature() {
         return minColorTemperature;
     }
 
     @CalledByNative
@@ skipping 28 matching lines @@
         public double minZoom;
         public double currentZoom;
         public double stepZoom;
         public int focusMode;
         public int exposureMode;
         public double maxExposureCompensation;
         public double minExposureCompensation;
         public double currentExposureCompensation;
         public double stepExposureCompensation;
         public int whiteBalanceMode;
-        public int fillLightMode;
+        public int[] fillLightModes;
+        public boolean torch;
         public boolean redEyeReduction;
         public int maxColorTemperature;
         public int minColorTemperature;
         public int currentColorTemperature;
         public int stepColorTemperature;
 
         public Builder() {}
 
         public Builder setMaxIso(int maxIso) {
             this.maxIso = maxIso;
@@ skipping 103 matching lines @@
         public Builder setStepExposureCompensation(double stepExposureCompensation) {
             this.stepExposureCompensation = stepExposureCompensation;
             return this;
         }
 
         public Builder setWhiteBalanceMode(int whiteBalanceMode) {
             this.whiteBalanceMode = whiteBalanceMode;
             return this;
         }
 
-        public Builder setFillLightMode(int fillLightMode) {
-            this.fillLightMode = fillLightMode;
+        public Builder setFillLightModes(int[] fillLightModes) {
+            this.fillLightModes = fillLightModes.clone();
             return this;
         }
 
+        public Builder setTorch(boolean torch) {
+            this.torch = torch;
+            return this;
+        }
+
         public Builder setRedEyeReduction(boolean redEyeReduction) {
             this.redEyeReduction = redEyeReduction;
             return this;
         }
 
         public Builder setMaxColorTemperature(int maxColorTemperature) {
             this.maxColorTemperature = maxColorTemperature;
             return this;
         }
 
@@ skipping 10 matching lines @@
         public Builder setStepColorTemperature(int stepColorTemperature) {
             this.stepColorTemperature = stepColorTemperature;
             return this;
         }
 
         public PhotoCapabilities build() {
             return new PhotoCapabilities(maxIso, minIso, currentIso, stepIso, maxHeight, minHeight,
                     currentHeight, stepHeight, maxWidth, minWidth, currentWidth, stepWidth, maxZoom,
                     minZoom, currentZoom, stepZoom, focusMode, exposureMode,
                     maxExposureCompensation, minExposureCompensation, currentExposureCompensation,
-                    stepExposureCompensation, whiteBalanceMode, fillLightMode, redEyeReduction,
-                    maxColorTemperature, minColorTemperature, currentColorTemperature,
-                    stepColorTemperature);
+                    stepExposureCompensation, whiteBalanceMode, fillLightModes, torch,
+                    redEyeReduction, maxColorTemperature, minColorTemperature,
+                    currentColorTemperature, stepColorTemperature);
         }
     }
 }