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

Unified Diff: media/capture/video/android/video_capture_device_android.cc

Issue 2385833002: Image Capture Android: wire color temperature set/get (Closed)
Patch Set: reillyg@s comments Created 4 years, 2 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/video/android/photo_capabilities.cc ('k') | no next file » | 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 4687bfe1f709bbf4ed19e4c2bb1b25844616d0ec..9554ac0215ed591ab151d6d40f023994a212c382 100644
--- a/media/capture/video/android/video_capture_device_android.cc
+++ b/media/capture/video/android/video_capture_device_android.cc
@@ -535,7 +535,11 @@ void VideoCaptureDeviceAndroid::DoGetPhotoCapabilities(
photo_capabilities->fill_light_mode =
ToMojomFillLightMode(caps.getFillLightMode());
photo_capabilities->red_eye_reduction = caps.getRedEyeReduction();
-
+ 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();
callback.Run(std::move(photo_capabilities));
}
@@ -595,7 +599,8 @@ void VideoCaptureDeviceAndroid::DoSetPhotoOptions(
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));
+ static_cast<int>(fill_light_mode),
+ settings->has_color_temperature ? settings->color_temperature : 0);
callback.Run(true);
}
« no previous file with comments | « media/capture/video/android/photo_capabilities.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698