Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(328)

Side by Side Diff: media/capture/video/fake_video_capture_device.cc

Issue 2806743003: Image Capture: split {white_balance,exposure,focus}_modes into current_ and supported_ (Closed)
Patch Set: reillyg@ comment and fix in v4l2_capture_delegate.cc Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "media/capture/video/fake_video_capture_device.h" 5 #include "media/capture/video/fake_video_capture_device.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <algorithm> 8 #include <algorithm>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 431 matching lines...) Expand 10 before | Expand all | Expand 10 after
442 GetPhotoCapabilitiesCallback callback) { 442 GetPhotoCapabilitiesCallback callback) {
443 DCHECK(thread_checker_.CalledOnValidThread()); 443 DCHECK(thread_checker_.CalledOnValidThread());
444 photo_device_->GetPhotoCapabilities(std::move(callback)); 444 photo_device_->GetPhotoCapabilities(std::move(callback));
445 } 445 }
446 446
447 void FakePhotoDevice::GetPhotoCapabilities( 447 void FakePhotoDevice::GetPhotoCapabilities(
448 VideoCaptureDevice::GetPhotoCapabilitiesCallback callback) { 448 VideoCaptureDevice::GetPhotoCapabilitiesCallback callback) {
449 mojom::PhotoCapabilitiesPtr photo_capabilities = 449 mojom::PhotoCapabilitiesPtr photo_capabilities =
450 mojom::PhotoCapabilities::New(); 450 mojom::PhotoCapabilities::New();
451 451
452 photo_capabilities->white_balance_mode = mojom::MeteringMode::NONE; 452 photo_capabilities->current_white_balance_mode = mojom::MeteringMode::NONE;
453 photo_capabilities->exposure_mode = mojom::MeteringMode::NONE; 453 photo_capabilities->current_exposure_mode = mojom::MeteringMode::NONE;
454 photo_capabilities->focus_mode = mojom::MeteringMode::NONE; 454 photo_capabilities->current_focus_mode = mojom::MeteringMode::NONE;
455 455
456 photo_capabilities->exposure_compensation = mojom::Range::New(); 456 photo_capabilities->exposure_compensation = mojom::Range::New();
457 photo_capabilities->color_temperature = mojom::Range::New(); 457 photo_capabilities->color_temperature = mojom::Range::New();
458 photo_capabilities->iso = mojom::Range::New(); 458 photo_capabilities->iso = mojom::Range::New();
459 photo_capabilities->iso->current = 100.0; 459 photo_capabilities->iso->current = 100.0;
460 photo_capabilities->iso->max = 100.0; 460 photo_capabilities->iso->max = 100.0;
461 photo_capabilities->iso->min = 100.0; 461 photo_capabilities->iso->min = 100.0;
462 photo_capabilities->iso->step = 0.0; 462 photo_capabilities->iso->step = 0.0;
463 463
464 photo_capabilities->brightness = media::mojom::Range::New(); 464 photo_capabilities->brightness = media::mojom::Range::New();
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
650 int session_id) { 650 int session_id) {
651 DCHECK(thread_checker_.CalledOnValidThread()); 651 DCHECK(thread_checker_.CalledOnValidThread());
652 if (session_id != current_session_id_) 652 if (session_id != current_session_id_)
653 return; 653 return;
654 654
655 frame_deliverer_->PaintAndDeliverNextFrame(elapsed_time_); 655 frame_deliverer_->PaintAndDeliverNextFrame(elapsed_time_);
656 BeepAndScheduleNextCapture(expected_execution_time); 656 BeepAndScheduleNextCapture(expected_execution_time);
657 } 657 }
658 658
659 } // namespace media 659 } // namespace media
OLDNEW
« no previous file with comments | « media/capture/video/android/video_capture_device_android.cc ('k') | media/capture/video/fake_video_capture_device_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698