MediaSettingsRange: s/long/double/ in MediaSettingsRange.idl and PhotoCapabilities.idl

media/capture/video/android/video_capture_device_android.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/capture/video/android/video_capture_device_android.h"
 
 #include <stdint.h>
 #include <utility>
 
 #include "base/android/jni_android.h"
@@ skipping 550 matching lines @@
   DCHECK(main_task_runner_->BelongsToCurrentThread());
 #if DCHECK_IS_ON()
   {
     base::AutoLock lock(lock_);
     DCHECK_EQ(kConfigured, state_);
     DCHECK(got_first_frame_);
   }
 #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
           ? ToAndroidMeteringMode(settings->focus_mode)
           : PhotoCapabilities::AndroidMeteringMode::NOT_SET;
 
   const PhotoCapabilities::AndroidMeteringMode exposure_mode =
       settings->has_exposure_mode
           ? ToAndroidMeteringMode(settings->exposure_mode)
           : PhotoCapabilities::AndroidMeteringMode::NOT_SET;
 
   std::vector<float> points_of_interest_marshalled;
   for (const auto& point : settings->points_of_interest) {
     points_of_interest_marshalled.push_back(point->x);
     points_of_interest_marshalled.push_back(point->y);
   }
   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 =
       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;

[Reilly Grant (use Gerrit), 2016/11/09 21:16:55]

While you're changing this around can you make some consistency between whether
or not these properties are declared as local variables before being passed to
setPhotoOptions?

[mcasas, 2016/11/09 22:44:14]

Done. I also moved |width| and |height| assignment
after|exposure_mode| so that the initialization order 
replicates the usage.

 
   const PhotoCapabilities::AndroidFillLightMode fill_light_mode =
       settings->has_fill_light_mode
           ? ToAndroidFillLightMode(settings->fill_light_mode)
           : PhotoCapabilities::AndroidFillLightMode::NOT_SET;
 
   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);
 
   callback.Run(true);
 }
 
 }  // namespace media