Image Capture Linux/CrOs, implement brightness, contrast, saturation and sharpness

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 <poll.h>
 #include <sys/fcntl.h>
 #include <sys/ioctl.h>
 #include <sys/mman.h>
@@ skipping 80 matching lines @@
   request_buffer->memory = V4L2_MEMORY_MMAP;
   request_buffer->count = count;
 }
 
 // Returns the input |fourcc| as a std::string four char representation.
 static std::string FourccToString(uint32_t fourcc) {
   return base::StringPrintf("%c%c%c%c", fourcc & 0xFF, (fourcc >> 8) & 0xFF,
                             (fourcc >> 16) & 0xFF, (fourcc >> 24) & 0xFF);
 }
 
+// Creates a mojom::RangePtr with the range of values (min, max, current) of the
+// user control associated with  |control_id|. Returns an empty Range otherwise.
+static mojom::RangePtr RetrieveUserControlRange(int device_fd, int control_id) {
+  mojom::RangePtr capability = mojom::Range::New();
+
+  v4l2_queryctrl range = {};
+  range.id = control_id;
+  range.type = V4L2_CTRL_TYPE_INTEGER;
+  if (HANDLE_EINTR(ioctl(device_fd, VIDIOC_QUERYCTRL, &range)) < 0)
+    return mojom::Range::New();
+  capability->max = range.maximum;
+  capability->min = range.minimum;
+
+  v4l2_control current = {};
+  current.id = control_id;
+  if (HANDLE_EINTR(ioctl(device_fd, VIDIOC_G_CTRL, &current)) < 0)
+    return mojom::Range::New();
+  capability->current = current.value;
+
+  return capability;
+}
+
 // Class keeping track of a SPLANE V4L2 buffer, mmap()ed on construction and
 // munmap()ed on destruction.
 class V4L2CaptureDelegate::BufferTracker
     : public base::RefCounted<BufferTracker> {
  public:
   BufferTracker();
   // Abstract method to mmap() given |fd| according to |buffer|.
   bool Init(int fd, const v4l2_buffer& buffer);
 
   const uint8_t* start() const { return start_; }
@@ skipping 223 matching lines @@
 
 void V4L2CaptureDelegate::GetPhotoCapabilities(
     VideoCaptureDevice::GetPhotoCapabilitiesCallback callback) {
   DCHECK(v4l2_task_runner_->BelongsToCurrentThread());
   if (!device_fd_.is_valid() || !is_capturing_)
     return;
 
   mojom::PhotoCapabilitiesPtr photo_capabilities =
       mojom::PhotoCapabilities::New();
 
-  photo_capabilities->zoom = mojom::Range::New();
-  v4l2_queryctrl zoom_range = {};
-  zoom_range.id = V4L2_CID_ZOOM_ABSOLUTE;
-  zoom_range.type = V4L2_CTRL_TYPE_INTEGER;
-  if (HANDLE_EINTR(ioctl(device_fd_.get(), VIDIOC_QUERYCTRL, &zoom_range)) >=
-      0) {
-    photo_capabilities->zoom->max = zoom_range.maximum * kZoomMultiplier;
-    photo_capabilities->zoom->min = zoom_range.minimum * kZoomMultiplier;
-  }
-  v4l2_control zoom_current = {};
-  zoom_current.id = V4L2_CID_ZOOM_ABSOLUTE;
-  if (HANDLE_EINTR(ioctl(device_fd_.get(), VIDIOC_G_CTRL, &zoom_current)) >= 0)
-    photo_capabilities->zoom->current = zoom_current.value * kZoomMultiplier;
+  photo_capabilities->zoom =
+      RetrieveUserControlRange(device_fd_.get(), V4L2_CID_ZOOM_ABSOLUTE);
 
   photo_capabilities->focus_mode = mojom::MeteringMode::NONE;
   v4l2_control auto_focus_current = {};
   auto_focus_current.id = V4L2_CID_FOCUS_AUTO;
   if (HANDLE_EINTR(
           ioctl(device_fd_.get(), VIDIOC_G_CTRL, &auto_focus_current)) >= 0) {
     photo_capabilities->focus_mode = auto_focus_current.value
                                          ? mojom::MeteringMode::CONTINUOUS
                                          : mojom::MeteringMode::MANUAL;
   }
@@ skipping 12 matching lines @@
   photo_capabilities->white_balance_mode = mojom::MeteringMode::NONE;
   v4l2_control white_balance_current = {};
   white_balance_current.id = V4L2_CID_AUTO_WHITE_BALANCE;
   if (HANDLE_EINTR(ioctl(device_fd_.get(), VIDIOC_G_CTRL,
                          &white_balance_current)) >= 0) {
     photo_capabilities->white_balance_mode =
         white_balance_current.value ? mojom::MeteringMode::CONTINUOUS
                                     : mojom::MeteringMode::MANUAL;
   }
 
-  photo_capabilities->color_temperature = mojom::Range::New();
-  v4l2_queryctrl color_temperature_range = {};
-  color_temperature_range.id = V4L2_CID_WHITE_BALANCE_TEMPERATURE;
-  color_temperature_range.type = V4L2_CTRL_TYPE_INTEGER;
-  if (HANDLE_EINTR(ioctl(device_fd_.get(), VIDIOC_QUERYCTRL,
-                         &color_temperature_range)) >= 0) {
-    photo_capabilities->color_temperature->max =
-        color_temperature_range.maximum;
-    photo_capabilities->color_temperature->min =
-        color_temperature_range.minimum;
-  }
-
-  v4l2_control color_temperature_current = {};
-  color_temperature_current.id = V4L2_CID_WHITE_BALANCE_TEMPERATURE;
-  if (HANDLE_EINTR(ioctl(device_fd_.get(), VIDIOC_G_CTRL,
-                         &color_temperature_current)) >= 0) {
-    photo_capabilities->color_temperature->current =
-        color_temperature_current.value;
-  }
+  photo_capabilities->color_temperature = RetrieveUserControlRange(
+      device_fd_.get(), V4L2_CID_WHITE_BALANCE_TEMPERATURE);
 
   photo_capabilities->iso = mojom::Range::New();
   photo_capabilities->height = mojom::Range::New();
   photo_capabilities->width = mojom::Range::New();
   photo_capabilities->exposure_compensation = mojom::Range::New();
   photo_capabilities->fill_light_mode = mojom::FillLightMode::NONE;
   photo_capabilities->red_eye_reduction = false;
+
+  photo_capabilities->brightness =
+      RetrieveUserControlRange(device_fd_.get(), V4L2_CID_BRIGHTNESS);
+  photo_capabilities->contrast =
+      RetrieveUserControlRange(device_fd_.get(), V4L2_CID_CONTRAST);
+  photo_capabilities->saturation =
+      RetrieveUserControlRange(device_fd_.get(), V4L2_CID_SATURATION);
+  photo_capabilities->sharpness =
+      RetrieveUserControlRange(device_fd_.get(), V4L2_CID_SHARPNESS);
+
   callback.Run(std::move(photo_capabilities));
 }
 
 void V4L2CaptureDelegate::SetPhotoOptions(
     mojom::PhotoSettingsPtr settings,
     VideoCaptureDevice::SetPhotoOptionsCallback callback) {
   DCHECK(v4l2_task_runner_->BelongsToCurrentThread());
   if (!device_fd_.is_valid() || !is_capturing_)
     return;
 
@@ skipping 22 matching lines @@
     const int result = HANDLE_EINTR(
         ioctl(device_fd_.get(), VIDIOC_G_CTRL, &auto_white_balance_current));
     if (result >= 0 && !auto_white_balance_current.value) {
       v4l2_control set_temperature = {};
       set_temperature.id = V4L2_CID_WHITE_BALANCE_TEMPERATURE;
       set_temperature.value = settings->color_temperature;
       HANDLE_EINTR(ioctl(device_fd_.get(), VIDIOC_S_CTRL, &set_temperature));
     }
   }
 
+  if (settings->has_brightness) {
+    v4l2_control current = {};
+    current.id = V4L2_CID_BRIGHTNESS;
+    current.value = settings->brightness;
+    if (HANDLE_EINTR(ioctl(device_fd_.get(), VIDIOC_S_CTRL, &current)) < 0)
+      DPLOG(ERROR) << "setting brightness to " << settings->brightness;
+  }
+  if (settings->has_brightness) {

[chfremer, 2016/10/04 17:36:06]

Copy-paste error here and the blocks below?

[mcasas, 2016/10/04 17:44:11]

Oh, hark, good catch. Done.

+    v4l2_control current = {};
+    current.id = V4L2_CID_CONTRAST;
+    current.value = settings->contrast;
+    if (HANDLE_EINTR(ioctl(device_fd_.get(), VIDIOC_S_CTRL, &current)) < 0)
+      DPLOG(ERROR) << "setting contrast to " << settings->contrast;
+  }
+  if (settings->has_brightness) {
+    v4l2_control current = {};
+    current.id = V4L2_CID_SATURATION;
+    current.value = settings->saturation;
+    if (HANDLE_EINTR(ioctl(device_fd_.get(), VIDIOC_S_CTRL, &current)) < 0)
+      DPLOG(ERROR) << "setting saturation to " << settings->saturation;
+  }
+  if (settings->has_brightness) {
+    v4l2_control current = {};
+    current.id = V4L2_CID_SHARPNESS;
+    current.value = settings->sharpness;
+    if (HANDLE_EINTR(ioctl(device_fd_.get(), VIDIOC_S_CTRL, &current)) < 0)
+      DPLOG(ERROR) << "setting sharpness to " << settings->sharpness;
+  }
+
   callback.Run(true);
 }
 
 void V4L2CaptureDelegate::SetRotation(int rotation) {
   DCHECK(v4l2_task_runner_->BelongsToCurrentThread());
   DCHECK(rotation >= 0 && rotation < 360 && rotation % 90 == 0);
   rotation_ = rotation;
 }
 
 V4L2CaptureDelegate::~V4L2CaptureDelegate() {}
@@ skipping 118 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