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

Unified Diff: media/capture/video/android/video_capture_device_android.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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/capture/mojo/image_capture.mojom ('k') | media/capture/video/fake_video_capture_device.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/capture/video/android/video_capture_device_android.cc
diff --git a/media/capture/video/android/video_capture_device_android.cc b/media/capture/video/android/video_capture_device_android.cc
index fa6f03b27f103f24d60ccb35497270ca99f1a881..0671b3dcceb70dc078828134ccaa3f40dacbc9db 100644
--- a/media/capture/video/android/video_capture_device_android.cc
+++ b/media/capture/video/android/video_capture_device_android.cc
@@ -504,11 +504,14 @@ void VideoCaptureDeviceAndroid::DoGetPhotoCapabilities(
mojom::PhotoCapabilitiesPtr photo_capabilities =
mojom::PhotoCapabilities::New();
- photo_capabilities->white_balance_mode =
+ // TODO(mcasas): Update |supported_{white_balance,exposure,focus}_modes| as
+ // well, https://crbug.com/700607.
+ photo_capabilities->current_white_balance_mode =
ToMojomMeteringMode(caps.getWhiteBalanceMode());
- photo_capabilities->exposure_mode =
+ photo_capabilities->current_exposure_mode =
ToMojomMeteringMode(caps.getExposureMode());
- photo_capabilities->focus_mode = ToMojomMeteringMode(caps.getFocusMode());
+ photo_capabilities->current_focus_mode =
+ ToMojomMeteringMode(caps.getFocusMode());
photo_capabilities->exposure_compensation = mojom::Range::New();
photo_capabilities->exposure_compensation->current =
« no previous file with comments | « media/capture/mojo/image_capture.mojom ('k') | media/capture/video/fake_video_capture_device.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698