ImageCapture: separate fillLightMode, redEyeReduction and Torch

media/capture/video/android/photo_capabilities.cc

 // 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.
 
 #include "media/capture/video/android/photo_capabilities.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "jni/PhotoCapabilities_jni.h"
@@ skipping 127 matching lines @@
 }
 
 PhotoCapabilities::AndroidMeteringMode PhotoCapabilities::getWhiteBalanceMode()
     const {
   DCHECK(!object_.is_null());
   return static_cast<AndroidMeteringMode>(
       Java_PhotoCapabilities_getWhiteBalanceMode(AttachCurrentThread(),
                                                  object_));
 }
 
-PhotoCapabilities::AndroidFillLightMode PhotoCapabilities::getFillLightMode()
-    const {
+std::vector<PhotoCapabilities::AndroidFillLightMode>
+PhotoCapabilities::getFillLightModes() const {
   DCHECK(!object_.is_null());
-  return static_cast<AndroidFillLightMode>(
-      Java_PhotoCapabilities_getFillLightMode(AttachCurrentThread(), object_));
+
+  JNIEnv* env = AttachCurrentThread();
+  std::vector<AndroidFillLightMode> modes;
+  static_assert(
+      std::is_same<int,
+                   std::underlying_type<AndroidFillLightMode>::type>::value,
+      "AndroidFillLightMode underlying type should be int");
+
+  base::android::ScopedJavaLocalRef<jintArray> jni_modes =
+      Java_PhotoCapabilities_getFillLightModes(env, object_);
+  if (jni_modes.obj()) {
+    base::android::JavaIntArrayToIntVector(
+        env, jni_modes.obj(), reinterpret_cast<std::vector<int>*>(&modes));
+  }
+  return modes;
+}
+
+bool PhotoCapabilities::getTorch() const {
+  DCHECK(!object_.is_null());
+  return Java_PhotoCapabilities_getTorch(AttachCurrentThread(), object_);
 }
 
 bool PhotoCapabilities::getRedEyeReduction() const {
   DCHECK(!object_.is_null());
   return Java_PhotoCapabilities_getRedEyeReduction(AttachCurrentThread(),
                                                    object_);
 }
 
 int PhotoCapabilities::getMinColorTemperature() const {
   DCHECK(!object_.is_null());
@@ skipping 13 matching lines @@
       AttachCurrentThread(), object_);
 }
 
 int PhotoCapabilities::getStepColorTemperature() const {
   DCHECK(!object_.is_null());
   return Java_PhotoCapabilities_getStepColorTemperature(AttachCurrentThread(),
                                                         object_);
 }
 
 }  // namespace media