| 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 504 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 515 photo_capabilities->exposure_compensation->current = | 515 photo_capabilities->exposure_compensation->current = |
| 516 caps.getCurrentExposureCompensation(); | 516 caps.getCurrentExposureCompensation(); |
| 517 photo_capabilities->exposure_compensation->max = | 517 photo_capabilities->exposure_compensation->max = |
| 518 caps.getMaxExposureCompensation(); | 518 caps.getMaxExposureCompensation(); |
| 519 photo_capabilities->exposure_compensation->min = | 519 photo_capabilities->exposure_compensation->min = |
| 520 caps.getMinExposureCompensation(); | 520 caps.getMinExposureCompensation(); |
| 521 photo_capabilities->white_balance_mode = | 521 photo_capabilities->white_balance_mode = |
| 522 ToMojomMeteringMode(caps.getWhiteBalanceMode()); | 522 ToMojomMeteringMode(caps.getWhiteBalanceMode()); |
| 523 photo_capabilities->fill_light_mode = | 523 photo_capabilities->fill_light_mode = |
| 524 ToMojomFillLightMode(caps.getFillLightMode()); | 524 ToMojomFillLightMode(caps.getFillLightMode()); |
| 525 photo_capabilities->red_eye_reduction = caps.getRedEyeReduction(); |
| 525 | 526 |
| 526 callback.Run(std::move(photo_capabilities)); | 527 callback.Run(std::move(photo_capabilities)); |
| 527 } | 528 } |
| 528 | 529 |
| 529 void VideoCaptureDeviceAndroid::DoSetPhotoOptions( | 530 void VideoCaptureDeviceAndroid::DoSetPhotoOptions( |
| 530 mojom::PhotoSettingsPtr settings, | 531 mojom::PhotoSettingsPtr settings, |
| 531 SetPhotoOptionsCallback callback) { | 532 SetPhotoOptionsCallback callback) { |
| 532 DCHECK(main_task_runner_->BelongsToCurrentThread()); | 533 DCHECK(main_task_runner_->BelongsToCurrentThread()); |
| 533 #if DCHECK_IS_ON() | 534 #if DCHECK_IS_ON() |
| 534 { | 535 { |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 581 static_cast<int>(exposure_mode), width, height, points_of_interest, | 582 static_cast<int>(exposure_mode), width, height, points_of_interest, |
| 582 settings->has_exposure_compensation, exposure_compensation, | 583 settings->has_exposure_compensation, exposure_compensation, |
| 583 static_cast<int>(white_balance_mode), iso, | 584 static_cast<int>(white_balance_mode), iso, |
| 584 settings->has_red_eye_reduction, settings->red_eye_reduction, | 585 settings->has_red_eye_reduction, settings->red_eye_reduction, |
| 585 static_cast<int>(fill_light_mode)); | 586 static_cast<int>(fill_light_mode)); |
| 586 | 587 |
| 587 callback.Run(true); | 588 callback.Run(true); |
| 588 } | 589 } |
| 589 | 590 |
| 590 } // namespace media | 591 } // namespace media |
| OLD | NEW |