| 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);
|
| }
|
|
|