Image Capture: wire supported exposure/focus/white balance modes Android

media/capture/video/android/video_capture_device_android.cc

 // Copyright (c) 2013 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/video_capture_device_android.h"
 
 #include <stdint.h>
 #include <utility>
 
 #include "base/android/jni_android.h"
@@ skipping 486 matching lines @@
   JNIEnv* env = AttachCurrentThread();
 
   PhotoCapabilities caps(
       Java_VideoCapture_getPhotoCapabilities(env, j_capture_));
 
   // TODO(mcasas): Manual member copying sucks, consider adding typemapping from
   // PhotoCapabilities to mojom::PhotoCapabilitiesPtr, https://crbug.com/622002.
   mojom::PhotoCapabilitiesPtr photo_capabilities =
       mojom::PhotoCapabilities::New();
 
-  // TODO(mcasas): Update |supported_{white_balance,exposure,focus}_modes| as
-  // well, https://crbug.com/700607.
+  const auto jni_white_balance_modes = caps.getWhiteBalanceModes();
+  std::vector<mojom::MeteringMode> white_balance_modes;
+  for (const auto& white_balance_mode : jni_white_balance_modes)
+    white_balance_modes.push_back(ToMojomMeteringMode(white_balance_mode));
+  photo_capabilities->supported_white_balance_modes = white_balance_modes;
   photo_capabilities->current_white_balance_mode =
       ToMojomMeteringMode(caps.getWhiteBalanceMode());
+
+  const auto jni_exposure_modes = caps.getExposureModes();
+  std::vector<mojom::MeteringMode> exposure_modes;
+  for (const auto& exposure_mode : jni_exposure_modes)
+    exposure_modes.push_back(ToMojomMeteringMode(exposure_mode));
+  photo_capabilities->supported_exposure_modes = exposure_modes;
   photo_capabilities->current_exposure_mode =
       ToMojomMeteringMode(caps.getExposureMode());
+
+  const auto jni_focus_modes = caps.getFocusModes();
+  std::vector<mojom::MeteringMode> focus_modes;
+  for (const auto& focus_mode : jni_focus_modes)
+    focus_modes.push_back(ToMojomMeteringMode(focus_mode));
+  photo_capabilities->supported_focus_modes = focus_modes;
   photo_capabilities->current_focus_mode =
       ToMojomMeteringMode(caps.getFocusMode());
 
   photo_capabilities->exposure_compensation = mojom::Range::New();
   photo_capabilities->exposure_compensation->current =
       caps.getCurrentExposureCompensation();
   photo_capabilities->exposure_compensation->max =
       caps.getMaxExposureCompensation();
   photo_capabilities->exposure_compensation->min =
       caps.getMinExposureCompensation();
   photo_capabilities->exposure_compensation->step =
       caps.getStepExposureCompensation();
   photo_capabilities->color_temperature = mojom::Range::New();
   photo_capabilities->color_temperature->current =
       caps.getCurrentColorTemperature();
   photo_capabilities->color_temperature->max = caps.getMaxColorTemperature();
   photo_capabilities->color_temperature->min = caps.getMinColorTemperature();
   photo_capabilities->color_temperature->step = caps.getStepColorTemperature();
   photo_capabilities->iso = mojom::Range::New();
   photo_capabilities->iso->current = caps.getCurrentIso();
   photo_capabilities->iso->max = caps.getMaxIso();
   photo_capabilities->iso->min = caps.getMinIso();
   photo_capabilities->iso->step = caps.getStepIso();
 
-  photo_capabilities->brightness = media::mojom::Range::New();
-  photo_capabilities->contrast = media::mojom::Range::New();
-  photo_capabilities->saturation = media::mojom::Range::New();
-  photo_capabilities->sharpness = media::mojom::Range::New();
+  photo_capabilities->brightness = mojom::Range::New();
+  photo_capabilities->contrast = mojom::Range::New();
+  photo_capabilities->saturation = mojom::Range::New();
+  photo_capabilities->sharpness = mojom::Range::New();
 
   photo_capabilities->zoom = mojom::Range::New();
   photo_capabilities->zoom->current = caps.getCurrentZoom();
   photo_capabilities->zoom->max = caps.getMaxZoom();
   photo_capabilities->zoom->min = caps.getMinZoom();
   photo_capabilities->zoom->step = caps.getStepZoom();
 
   photo_capabilities->supports_torch = caps.getSupportsTorch();
   photo_capabilities->torch = caps.getTorch();
 
   photo_capabilities->red_eye_reduction =
-      caps.getRedEyeReduction() ? media::mojom::RedEyeReduction::CONTROLLABLE
-                                : media::mojom::RedEyeReduction::NEVER;
+      caps.getRedEyeReduction() ? mojom::RedEyeReduction::CONTROLLABLE
+                                : mojom::RedEyeReduction::NEVER;
   photo_capabilities->height = mojom::Range::New();
   photo_capabilities->height->current = caps.getCurrentHeight();
   photo_capabilities->height->max = caps.getMaxHeight();
   photo_capabilities->height->min = caps.getMinHeight();
   photo_capabilities->height->step = caps.getStepHeight();
   photo_capabilities->width = mojom::Range::New();
   photo_capabilities->width->current = caps.getCurrentWidth();
   photo_capabilities->width->max = caps.getMaxWidth();
   photo_capabilities->width->min = caps.getMinWidth();
   photo_capabilities->width->step = caps.getStepWidth();
   const auto fill_light_modes = caps.getFillLightModes();
-  std::vector<media::mojom::FillLightMode> modes;
+  std::vector<mojom::FillLightMode> modes;
   for (const auto& fill_light_mode : fill_light_modes)
     modes.push_back(ToMojomFillLightMode(fill_light_mode));
   photo_capabilities->fill_light_mode = modes;
 
   callback.Run(std::move(photo_capabilities));
 }
 
 void VideoCaptureDeviceAndroid::DoSetPhotoOptions(
     mojom::PhotoSettingsPtr settings,
     SetPhotoOptionsCallback callback) {
@@ skipping 55 matching lines @@
       settings->has_exposure_compensation, exposure_compensation,
       static_cast<int>(white_balance_mode), iso,
       settings->has_red_eye_reduction, settings->red_eye_reduction,
       static_cast<int>(fill_light_mode), settings->has_torch, settings->torch,
       color_temperature);
 
   callback.Run(true);
 }
 
 }  // namespace media