Chromium Code Reviews| 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 d8ff2b74d99942511470321e51eeddb1db48dab0..ff0e2148a6568ca7b90b39b4b255d6517dc2d42b 100644 |
| --- a/media/capture/video/android/video_capture_device_android.cc |
| +++ b/media/capture/video/android/video_capture_device_android.cc |
| @@ -568,9 +568,9 @@ void VideoCaptureDeviceAndroid::DoSetPhotoOptions( |
| #endif |
| JNIEnv* env = AttachCurrentThread(); |
| - const int width = settings->has_width ? settings->width : 0; |
| - const int height = settings->has_height ? settings->height : 0; |
| - const int zoom = settings->has_zoom ? settings->zoom : 0; |
| + const double width = settings->has_width ? settings->width : 0; |
| + const double height = settings->has_height ? settings->height : 0; |
| + const double zoom = settings->has_zoom ? settings->zoom : 0; |
| const PhotoCapabilities::AndroidMeteringMode focus_mode = |
| settings->has_focus_mode |
| @@ -590,7 +590,7 @@ void VideoCaptureDeviceAndroid::DoSetPhotoOptions( |
| ScopedJavaLocalRef<jfloatArray> points_of_interest = |
| base::android::ToJavaFloatArray(env, points_of_interest_marshalled); |
| - const int exposure_compensation = |
| + const double exposure_compensation = |
| settings->has_exposure_compensation ? settings->exposure_compensation : 0; |
| const PhotoCapabilities::AndroidMeteringMode white_balance_mode = |
| @@ -598,7 +598,7 @@ void VideoCaptureDeviceAndroid::DoSetPhotoOptions( |
| ? ToAndroidMeteringMode(settings->white_balance_mode) |
| : PhotoCapabilities::AndroidMeteringMode::NOT_SET; |
| - const int iso = settings->has_iso ? settings->iso : 0; |
| + const double iso = settings->has_iso ? settings->iso : 0; |
|
Reilly Grant (use Gerrit)
2016/11/09 21:16:55
While you're changing this around can you make som
mcasas
2016/11/09 22:44:14
Done. I also moved |width| and |height| assignment
|
| const PhotoCapabilities::AndroidFillLightMode fill_light_mode = |
| settings->has_fill_light_mode |