Change webcamPrivate.set/get/reset to async APIs.

extensions/browser/api/webcam_private/v4l2_webcam.cc

Index: extensions/browser/api/webcam_private/v4l2_webcam.cc
diff --git a/extensions/browser/api/webcam_private/v4l2_webcam.cc b/extensions/browser/api/webcam_private/v4l2_webcam.cc
index f6d53c50c0dbb60bc5328b89a2965587c6c9e258..f48b34447c0e590842fad8fff2422b4b197c7d3e 100644
--- a/extensions/browser/api/webcam_private/v4l2_webcam.cc
+++ b/extensions/browser/api/webcam_private/v4l2_webcam.cc
@@ -85,55 +85,38 @@ bool V4L2Webcam::GetWebcamParameter(int fd, uint32_t control_id, int* value) {
   return true;
 }
 
-void V4L2Webcam::Reset(bool pan, bool tilt, bool zoom) {
-  if (pan || tilt) {
-    if (EnsureLogitechCommandsMapped()) {
-      SetWebcamParameter(fd_.get(), V4L2_CID_PANTILT_CMD,
-                         kLogitechMenuIndexGoHome);
-    } else {
-      if (pan) {
-        struct v4l2_control v4l2_ctrl = {V4L2_CID_PAN_RESET};
-        HANDLE_EINTR(ioctl(fd_.get(), VIDIOC_S_CTRL, &v4l2_ctrl));
-      }
-
-      if (tilt) {
-        struct v4l2_control v4l2_ctrl = {V4L2_CID_TILT_RESET};
-        HANDLE_EINTR(ioctl(fd_.get(), VIDIOC_S_CTRL, &v4l2_ctrl));
-      }
-    }
-  }
-
-  if (zoom) {
-    const int kDefaultZoom = 100;
-    SetWebcamParameter(fd_.get(), V4L2_CID_ZOOM_ABSOLUTE, kDefaultZoom);
-  }
-}
-
-bool V4L2Webcam::GetPan(int* value) {
-  return GetWebcamParameter(fd_.get(), V4L2_CID_PAN_ABSOLUTE, value);
+void V4L2Webcam::GetPan(const GetPTZCompleteCallback& callback) {
+  int value = 0;
+  bool success = GetWebcamParameter(fd_.get(), V4L2_CID_PAN_ABSOLUTE, &value);
+  callback.Run(success, value);
 }
 
-bool V4L2Webcam::GetTilt(int* value) {
-  return GetWebcamParameter(fd_.get(), V4L2_CID_TILT_ABSOLUTE, value);
+void V4L2Webcam::GetTilt(const GetPTZCompleteCallback& callback) {
+  int value = 0;
+  bool success = GetWebcamParameter(fd_.get(), V4L2_CID_TILT_ABSOLUTE, &value);
+  callback.Run(success, value);
 }
 
-bool V4L2Webcam::GetZoom(int* value) {
-  return GetWebcamParameter(fd_.get(), V4L2_CID_ZOOM_ABSOLUTE, value);
+void V4L2Webcam::GetZoom(const GetPTZCompleteCallback& callback) {
+  int value = 0;
+  bool success = GetWebcamParameter(fd_.get(), V4L2_CID_ZOOM_ABSOLUTE, &value);
+  callback.Run(success, value);
 }
 
-bool V4L2Webcam::SetPan(int value) {
-  return SetWebcamParameter(fd_.get(), V4L2_CID_PAN_ABSOLUTE, value);
+void V4L2Webcam::SetPan(int value, const SetPTZCompleteCallback& callback) {
+  callback.Run(SetWebcamParameter(fd_.get(), V4L2_CID_PAN_ABSOLUTE, value));
 }
 
-bool V4L2Webcam::SetTilt(int value) {
-  return SetWebcamParameter(fd_.get(), V4L2_CID_TILT_ABSOLUTE, value);
+void V4L2Webcam::SetTilt(int value, const SetPTZCompleteCallback& callback) {
+  callback.Run(SetWebcamParameter(fd_.get(), V4L2_CID_TILT_ABSOLUTE, value));
 }
 
-bool V4L2Webcam::SetZoom(int value) {
-  return SetWebcamParameter(fd_.get(), V4L2_CID_ZOOM_ABSOLUTE, value);
+void V4L2Webcam::SetZoom(int value, const SetPTZCompleteCallback& callback) {
+  callback.Run(SetWebcamParameter(fd_.get(), V4L2_CID_ZOOM_ABSOLUTE, value));
 }
 
-bool V4L2Webcam::SetPanDirection(PanDirection direction) {
+void V4L2Webcam::SetPanDirection(PanDirection direction,
+                                 const SetPTZCompleteCallback& callback) {
   int direction_value = 0;
   switch (direction) {
     case PAN_STOP:
@@ -148,10 +131,12 @@ bool V4L2Webcam::SetPanDirection(PanDirection direction) {
       direction_value = -1;
       break;
   }
-  return SetWebcamParameter(fd_.get(), V4L2_CID_PAN_SPEED, direction_value);
+  callback.Run(
+      SetWebcamParameter(fd_.get(), V4L2_CID_PAN_SPEED, direction_value));
 }
 
-bool V4L2Webcam::SetTiltDirection(TiltDirection direction) {
+void V4L2Webcam::SetTiltDirection(TiltDirection direction,
+                                  const SetPTZCompleteCallback& callback) {
   int direction_value = 0;
   switch (direction) {
     case TILT_STOP:
@@ -166,7 +151,39 @@ bool V4L2Webcam::SetTiltDirection(TiltDirection direction) {
       direction_value = -1;
       break;
   }
-  return SetWebcamParameter(fd_.get(), V4L2_CID_TILT_SPEED, direction_value);
+  callback.Run(
+      SetWebcamParameter(fd_.get(), V4L2_CID_TILT_SPEED, direction_value));
+}
+
+void V4L2Webcam::Reset(bool pan,
+                       bool tilt,
+                       bool zoom,
+                       const SetPTZCompleteCallback& callback) {
+  bool success = true;
+  if (pan || tilt) {
+    if (EnsureLogitechCommandsMapped()) {
+      success &= SetWebcamParameter(fd_.get(), V4L2_CID_PANTILT_CMD,

[Zachary Kuznia, 2015/08/19 20:49:44]

It's not a good idea to use bitwise AND to combine bools.  Please just set
success to false fail immediately when a call fails.

[xdai1, 2015/08/21 22:57:02]

Done.

+                                    kLogitechMenuIndexGoHome);
+    } else {
+      if (pan) {
+        struct v4l2_control v4l2_ctrl = {V4L2_CID_PAN_RESET};
+        success &= HANDLE_EINTR(ioctl(fd_.get(), VIDIOC_S_CTRL, &v4l2_ctrl));
+      }
+
+      if (tilt) {
+        struct v4l2_control v4l2_ctrl = {V4L2_CID_TILT_RESET};
+        success &= HANDLE_EINTR(ioctl(fd_.get(), VIDIOC_S_CTRL, &v4l2_ctrl));
+      }
+    }
+  }
+
+  if (zoom) {
+    const int kDefaultZoom = 100;
+    success &=
+        SetWebcamParameter(fd_.get(), V4L2_CID_ZOOM_ABSOLUTE, kDefaultZoom);
+  }
+
+  callback.Run(success);
 }
 
 }  // namespace extensions