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

media/capture/video/linux/v4l2_capture_delegate.cc

 // Copyright 2015 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/linux/v4l2_capture_delegate.h"
 
 #include <linux/version.h>
 #include <poll.h>
 #include <sys/fcntl.h>
 #include <sys/ioctl.h>
@@ skipping 34 matching lines @@
 // https://crbug.com/470717
 const int kCaptureTimeoutMs = 1000;
 // The number of continuous timeouts tolerated before treated as error.
 const int kContinuousTimeoutLimit = 10;
 // MJPEG is preferred if the requested width or height is larger than this.
 const int kMjpegWidth = 640;
 const int kMjpegHeight = 480;
 // Typical framerate, in fps
 const int kTypicalFramerate = 30;
 
-// Constant used to multiply zoom values to avoid using floating point. Used to
-// scale both the readings (min, max, current) and the value to set it to.
-const int kZoomMultiplier = 100;
-
 // V4L2 color formats supported by V4L2CaptureDelegate derived classes.
 // This list is ordered by precedence of use -- but see caveats for MJPEG.
 static struct {
   uint32_t fourcc;
   VideoPixelFormat pixel_format;
   size_t num_planes;
 } const kSupportedFormatsAndPlanarity[] = {
     {V4L2_PIX_FMT_YUV420, PIXEL_FORMAT_I420, 1},
     {V4L2_PIX_FMT_Y16, PIXEL_FORMAT_Y16, 1},
     {V4L2_PIX_FMT_Z16, PIXEL_FORMAT_Y16, 1},
@@ skipping 371 matching lines @@
 void V4L2CaptureDelegate::SetPhotoOptions(
     mojom::PhotoSettingsPtr settings,
     VideoCaptureDevice::SetPhotoOptionsCallback callback) {
   DCHECK(v4l2_task_runner_->BelongsToCurrentThread());
   if (!device_fd_.is_valid() || !is_capturing_)
     return;
 
   if (settings->has_zoom) {
     v4l2_control zoom_current = {};
     zoom_current.id = V4L2_CID_ZOOM_ABSOLUTE;
-    zoom_current.value = settings->zoom / kZoomMultiplier;
+    zoom_current.value = settings->zoom;
     if (HANDLE_EINTR(ioctl(device_fd_.get(), VIDIOC_S_CTRL, &zoom_current)) < 0)
-      DPLOG(ERROR) << "setting zoom to " << settings->zoom / kZoomMultiplier;
+      DPLOG(ERROR) << "setting zoom to " << settings->zoom;
   }
 
   if (settings->has_white_balance_mode &&
       (settings->white_balance_mode == mojom::MeteringMode::CONTINUOUS ||
        settings->white_balance_mode == mojom::MeteringMode::MANUAL)) {
     v4l2_control white_balance_set = {};
     white_balance_set.id = V4L2_CID_AUTO_WHITE_BALANCE;
     white_balance_set.value =
         settings->white_balance_mode == mojom::MeteringMode::CONTINUOUS;
     HANDLE_EINTR(ioctl(device_fd_.get(), VIDIOC_S_CTRL, &white_balance_set));
@@ skipping 187 matching lines @@
     DLOG(ERROR) << "Error mmap()ing a V4L2 buffer into userspace";
     return false;
   }
   start_ = static_cast<uint8_t*>(start);
   length_ = buffer.length;
   payload_size_ = 0;
   return true;
 }
 
 }  // namespace media