| 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 524 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 535 photo_capabilities->contrast = media::mojom::Range::New(); | 535 photo_capabilities->contrast = media::mojom::Range::New(); |
| 536 photo_capabilities->saturation = media::mojom::Range::New(); | 536 photo_capabilities->saturation = media::mojom::Range::New(); |
| 537 photo_capabilities->sharpness = media::mojom::Range::New(); | 537 photo_capabilities->sharpness = media::mojom::Range::New(); |
| 538 | 538 |
| 539 photo_capabilities->zoom = mojom::Range::New(); | 539 photo_capabilities->zoom = mojom::Range::New(); |
| 540 photo_capabilities->zoom->current = caps.getCurrentZoom(); | 540 photo_capabilities->zoom->current = caps.getCurrentZoom(); |
| 541 photo_capabilities->zoom->max = caps.getMaxZoom(); | 541 photo_capabilities->zoom->max = caps.getMaxZoom(); |
| 542 photo_capabilities->zoom->min = caps.getMinZoom(); | 542 photo_capabilities->zoom->min = caps.getMinZoom(); |
| 543 photo_capabilities->zoom->step = caps.getStepZoom(); | 543 photo_capabilities->zoom->step = caps.getStepZoom(); |
| 544 | 544 |
| 545 photo_capabilities->supports_torch = caps.getSupportsTorch(); |
| 545 photo_capabilities->torch = caps.getTorch(); | 546 photo_capabilities->torch = caps.getTorch(); |
| 546 | 547 |
| 547 photo_capabilities->red_eye_reduction = | 548 photo_capabilities->red_eye_reduction = |
| 548 caps.getRedEyeReduction() ? media::mojom::RedEyeReduction::CONTROLLABLE | 549 caps.getRedEyeReduction() ? media::mojom::RedEyeReduction::CONTROLLABLE |
| 549 : media::mojom::RedEyeReduction::NEVER; | 550 : media::mojom::RedEyeReduction::NEVER; |
| 550 photo_capabilities->height = mojom::Range::New(); | 551 photo_capabilities->height = mojom::Range::New(); |
| 551 photo_capabilities->height->current = caps.getCurrentHeight(); | 552 photo_capabilities->height->current = caps.getCurrentHeight(); |
| 552 photo_capabilities->height->max = caps.getMaxHeight(); | 553 photo_capabilities->height->max = caps.getMaxHeight(); |
| 553 photo_capabilities->height->min = caps.getMinHeight(); | 554 photo_capabilities->height->min = caps.getMinHeight(); |
| 554 photo_capabilities->height->step = caps.getStepHeight(); | 555 photo_capabilities->height->step = caps.getStepHeight(); |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 627 settings->has_exposure_compensation, exposure_compensation, | 628 settings->has_exposure_compensation, exposure_compensation, |
| 628 static_cast<int>(white_balance_mode), iso, | 629 static_cast<int>(white_balance_mode), iso, |
| 629 settings->has_red_eye_reduction, settings->red_eye_reduction, | 630 settings->has_red_eye_reduction, settings->red_eye_reduction, |
| 630 static_cast<int>(fill_light_mode), settings->has_torch, settings->torch, | 631 static_cast<int>(fill_light_mode), settings->has_torch, settings->torch, |
| 631 color_temperature); | 632 color_temperature); |
| 632 | 633 |
| 633 callback.Run(true); | 634 callback.Run(true); |
| 634 } | 635 } |
| 635 | 636 |
| 636 } // namespace media | 637 } // namespace media |
| OLD | NEW |