ImageCapture: separate fillLightMode, redEyeReduction and Torch

media/capture/video/fake_video_capture_device.cc

 // Copyright (c) 2012 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/fake_video_capture_device.h"
 
 #include <stddef.h>
 #include <algorithm>
 #include <utility>
 
@@ skipping 430 matching lines @@
 void FakeVideoCaptureDevice::GetPhotoCapabilities(
     GetPhotoCapabilitiesCallback callback) {
   DCHECK(thread_checker_.CalledOnValidThread());
   photo_device_->GetPhotoCapabilities(std::move(callback));
 }
 
 void FakePhotoDevice::GetPhotoCapabilities(
     VideoCaptureDevice::GetPhotoCapabilitiesCallback callback) {
   mojom::PhotoCapabilitiesPtr photo_capabilities =
       mojom::PhotoCapabilities::New();
+
+  photo_capabilities->white_balance_mode = mojom::MeteringMode::NONE;
+  photo_capabilities->exposure_mode = mojom::MeteringMode::NONE;
+  photo_capabilities->focus_mode = mojom::MeteringMode::NONE;
+
+  photo_capabilities->exposure_compensation = mojom::Range::New();
+  photo_capabilities->color_temperature = mojom::Range::New();
   photo_capabilities->iso = mojom::Range::New();
   photo_capabilities->iso->current = 100.0;
   photo_capabilities->iso->max = 100.0;
   photo_capabilities->iso->min = 100.0;
   photo_capabilities->iso->step = 0.0;
+
+  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->zoom = mojom::Range::New();
+  photo_capabilities->zoom->current = fake_device_state_->zoom;
+  photo_capabilities->zoom->max = kMaxZoom;
+  photo_capabilities->zoom->min = kMinZoom;
+  photo_capabilities->zoom->step = kZoomStep;
+
+  photo_capabilities->torch = false;
+
+  photo_capabilities->red_eye_reduction = mojom::RedEyeReduction::NEVER;
   photo_capabilities->height = mojom::Range::New();
   photo_capabilities->height->current =
       fake_device_state_->format.frame_size.height();
   photo_capabilities->height->max = 1080.0;
   photo_capabilities->height->min = 96.0;
   photo_capabilities->height->step = 1.0;
   photo_capabilities->width = mojom::Range::New();
   photo_capabilities->width->current =
       fake_device_state_->format.frame_size.width();
   photo_capabilities->width->max = 1920.0;
   photo_capabilities->width->min = 96.0;
   photo_capabilities->width->step = 1.0;
-  photo_capabilities->zoom = mojom::Range::New();
-  photo_capabilities->zoom->current = fake_device_state_->zoom;
-  photo_capabilities->zoom->max = kMaxZoom;
-  photo_capabilities->zoom->min = kMinZoom;
-  photo_capabilities->zoom->step = kZoomStep;
-  photo_capabilities->focus_mode = mojom::MeteringMode::NONE;
-  photo_capabilities->exposure_mode = mojom::MeteringMode::NONE;
-  photo_capabilities->exposure_compensation = mojom::Range::New();
-  photo_capabilities->white_balance_mode = mojom::MeteringMode::NONE;
-  photo_capabilities->fill_light_mode = mojom::FillLightMode::NONE;
-  photo_capabilities->red_eye_reduction = false;
-  photo_capabilities->color_temperature = mojom::Range::New();
-  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();
+
   callback.Run(std::move(photo_capabilities));
 }
 
 void FakeVideoCaptureDevice::SetPhotoOptions(mojom::PhotoSettingsPtr settings,
                                              SetPhotoOptionsCallback callback) {
   DCHECK(thread_checker_.CalledOnValidThread());
   if (settings->has_zoom) {
     device_state_->zoom =
         std::max(kMinZoom, std::min(settings->zoom, kMaxZoom));
   }
@@ skipping 148 matching lines @@
     int session_id) {
   DCHECK(thread_checker_.CalledOnValidThread());
   if (session_id != current_session_id_)
     return;
 
   frame_deliverer_->PaintAndDeliverNextFrame(elapsed_time_);
   BeepAndScheduleNextCapture(expected_execution_time);
 }
 
 }  // namespace media