OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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/android/video_capture_device_android.h" | 5 #include "media/capture/video/android/video_capture_device_android.h" |
6 | 6 |
7 #include <stdint.h> | 7 #include <stdint.h> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/android/jni_android.h" | 10 #include "base/android/jni_android.h" |
(...skipping 522 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
533 photo_capabilities->white_balance_mode = | 533 photo_capabilities->white_balance_mode = |
534 ToMojomMeteringMode(caps.getWhiteBalanceMode()); | 534 ToMojomMeteringMode(caps.getWhiteBalanceMode()); |
535 photo_capabilities->fill_light_mode = | 535 photo_capabilities->fill_light_mode = |
536 ToMojomFillLightMode(caps.getFillLightMode()); | 536 ToMojomFillLightMode(caps.getFillLightMode()); |
537 photo_capabilities->red_eye_reduction = caps.getRedEyeReduction(); | 537 photo_capabilities->red_eye_reduction = caps.getRedEyeReduction(); |
538 photo_capabilities->color_temperature = mojom::Range::New(); | 538 photo_capabilities->color_temperature = mojom::Range::New(); |
539 photo_capabilities->color_temperature->current = | 539 photo_capabilities->color_temperature->current = |
540 caps.getCurrentColorTemperature(); | 540 caps.getCurrentColorTemperature(); |
541 photo_capabilities->color_temperature->max = caps.getMaxColorTemperature(); | 541 photo_capabilities->color_temperature->max = caps.getMaxColorTemperature(); |
542 photo_capabilities->color_temperature->min = caps.getMinColorTemperature(); | 542 photo_capabilities->color_temperature->min = caps.getMinColorTemperature(); |
| 543 photo_capabilities->brightness = media::mojom::Range::New(); |
| 544 photo_capabilities->contrast = media::mojom::Range::New(); |
| 545 photo_capabilities->saturation = media::mojom::Range::New(); |
| 546 photo_capabilities->sharpness = media::mojom::Range::New(); |
| 547 |
543 callback.Run(std::move(photo_capabilities)); | 548 callback.Run(std::move(photo_capabilities)); |
544 } | 549 } |
545 | 550 |
546 void VideoCaptureDeviceAndroid::DoSetPhotoOptions( | 551 void VideoCaptureDeviceAndroid::DoSetPhotoOptions( |
547 mojom::PhotoSettingsPtr settings, | 552 mojom::PhotoSettingsPtr settings, |
548 SetPhotoOptionsCallback callback) { | 553 SetPhotoOptionsCallback callback) { |
549 DCHECK(main_task_runner_->BelongsToCurrentThread()); | 554 DCHECK(main_task_runner_->BelongsToCurrentThread()); |
550 #if DCHECK_IS_ON() | 555 #if DCHECK_IS_ON() |
551 { | 556 { |
552 base::AutoLock lock(lock_); | 557 base::AutoLock lock(lock_); |
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
599 settings->has_exposure_compensation, exposure_compensation, | 604 settings->has_exposure_compensation, exposure_compensation, |
600 static_cast<int>(white_balance_mode), iso, | 605 static_cast<int>(white_balance_mode), iso, |
601 settings->has_red_eye_reduction, settings->red_eye_reduction, | 606 settings->has_red_eye_reduction, settings->red_eye_reduction, |
602 static_cast<int>(fill_light_mode), | 607 static_cast<int>(fill_light_mode), |
603 settings->has_color_temperature ? settings->color_temperature : 0); | 608 settings->has_color_temperature ? settings->color_temperature : 0); |
604 | 609 |
605 callback.Run(true); | 610 callback.Run(true); |
606 } | 611 } |
607 | 612 |
608 } // namespace media | 613 } // namespace media |
OLD | NEW |