Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1102)

Unified Diff: media/capture/video/android/video_capture_device_android.cc

Issue 2482983002: MediaSettingsRange: s/long/double/ in MediaSettingsRange.idl and PhotoCapabilities.idl (Closed)
Patch Set: s/float/double/ in fake_video_capture_device.* Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/capture/video/android/photo_capabilities.cc ('k') | media/capture/video/fake_video_capture_device.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..fb41fca5ae09dca214380cd309de6933a2fc2902 100644
--- a/media/capture/video/android/video_capture_device_android.cc
+++ b/media/capture/video/android/video_capture_device_android.cc
@@ -568,9 +568,7 @@ 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 zoom = settings->has_zoom ? settings->zoom : 0.0;
const PhotoCapabilities::AndroidMeteringMode focus_mode =
settings->has_focus_mode
@@ -582,6 +580,9 @@ void VideoCaptureDeviceAndroid::DoSetPhotoOptions(
? ToAndroidMeteringMode(settings->exposure_mode)
: PhotoCapabilities::AndroidMeteringMode::NOT_SET;
+ const double width = settings->has_width ? settings->width : 0.0;
+ const double height = settings->has_height ? settings->height : 0.0;
+
std::vector<float> points_of_interest_marshalled;
for (const auto& point : settings->points_of_interest) {
points_of_interest_marshalled.push_back(point->x);
@@ -590,29 +591,32 @@ void VideoCaptureDeviceAndroid::DoSetPhotoOptions(
ScopedJavaLocalRef<jfloatArray> points_of_interest =
base::android::ToJavaFloatArray(env, points_of_interest_marshalled);
- const int exposure_compensation =
- settings->has_exposure_compensation ? settings->exposure_compensation : 0;
+ const double exposure_compensation = settings->has_exposure_compensation
+ ? settings->exposure_compensation
+ : 0.0;
const PhotoCapabilities::AndroidMeteringMode white_balance_mode =
settings->has_white_balance_mode
? 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.0;
const PhotoCapabilities::AndroidFillLightMode fill_light_mode =
settings->has_fill_light_mode
? ToAndroidFillLightMode(settings->fill_light_mode)
: PhotoCapabilities::AndroidFillLightMode::NOT_SET;
+ const double color_temperature =
+ settings->has_color_temperature ? settings->color_temperature : 0.0;
+
Java_VideoCapture_setPhotoOptions(
env, j_capture_, zoom, static_cast<int>(focus_mode),
static_cast<int>(exposure_mode), width, height, points_of_interest,
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),
- settings->has_color_temperature ? settings->color_temperature : 0);
+ static_cast<int>(fill_light_mode), color_temperature);
callback.Run(true);
}
« no previous file with comments | « media/capture/video/android/photo_capabilities.cc ('k') | media/capture/video/fake_video_capture_device.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698