Commit 598292cb authored by zork@chromium.org's avatar zork@chromium.org

Reland r266017:

Send commands from webcamPrivate API to the webcam via V4L2 ioctls

BUG=346492
TBR=tommi@chromium.org
TBR=kalman@chromium.org

Review URL: https://codereview.chromium.org/256833003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@266442 0039d316-1c4b-4281-b951-d872f2087c98
parent 58e0145c
......@@ -4,8 +4,49 @@
#include "chrome/browser/extensions/api/webcam_private/webcam_private_api.h"
#include <fcntl.h>
#include <linux/videodev2.h>
#include <stdio.h>
#include <sys/ioctl.h>
#include <unistd.h>
#include "base/files/scoped_file.h"
#include "base/posix/eintr_wrapper.h"
#include "chrome/common/extensions/api/webcam_private.h"
namespace content {
class BrowserContext;
} // namespace content
namespace {
base::ScopedFD OpenWebcam(const std::string& extension_id,
content::BrowserContext* browser_context,
const std::string& webcam_id) {
// TODO(zork): Get device_id from content::MediaStreamManager.
std::string device_id = "/dev/video0";
return base::ScopedFD(HANDLE_EINTR(open(device_id.c_str(), 0)));
}
void SetWebcamParameter(int fd, uint32_t control_id, int value) {
struct v4l2_control v4l2_ctrl = {control_id, value};
HANDLE_EINTR(ioctl(fd, VIDIOC_S_CTRL, &v4l2_ctrl));
}
bool GetWebcamParameter(int fd, uint32_t control_id, int* value) {
struct v4l2_control v4l2_ctrl = {control_id};
if (HANDLE_EINTR(ioctl(fd, VIDIOC_G_CTRL, &v4l2_ctrl)))
return false;
*value = v4l2_ctrl.value;
return true;
}
const char kUnknownWebcam[] = "Unknown webcam id";
} // namespace
namespace extensions {
WebcamPrivateSetFunction::WebcamPrivateSetFunction() {
......@@ -20,7 +61,27 @@ bool WebcamPrivateSetFunction::RunImpl() {
api::webcam_private::Set::Params::Create(*args_));
EXTENSION_FUNCTION_VALIDATE(params.get());
// TODO(zork): Send the value to the webcam.
base::ScopedFD fd =
OpenWebcam(extension_id(), browser_context(), params->webcam_id);
if (!fd.is_valid()) {
SetError(kUnknownWebcam);
return false;
}
if (params->config.pan) {
SetWebcamParameter(fd.get(), V4L2_CID_PAN_ABSOLUTE,
*(params->config.pan));
}
if (params->config.tilt) {
SetWebcamParameter(fd.get(), V4L2_CID_TILT_ABSOLUTE,
*(params->config.tilt));
}
if (params->config.zoom) {
SetWebcamParameter(fd.get(), V4L2_CID_ZOOM_ABSOLUTE,
*(params->config.zoom));
}
return true;
}
......@@ -37,9 +98,30 @@ bool WebcamPrivateGetFunction::RunImpl() {
api::webcam_private::Get::Params::Create(*args_));
EXTENSION_FUNCTION_VALIDATE(params.get());
// TODO(zork): Get the value from the webcam.
base::ScopedFD fd =
OpenWebcam(extension_id(), browser_context(), params->webcam_id);
if (!fd.is_valid()) {
SetError(kUnknownWebcam);
return false;
}
api::webcam_private::WebcamConfiguration result;
return false;
int pan;
if (GetWebcamParameter(fd.get(), V4L2_CID_PAN_ABSOLUTE, &pan))
result.pan.reset(new double(pan));
int tilt;
if (GetWebcamParameter(fd.get(), V4L2_CID_TILT_ABSOLUTE, &tilt))
result.tilt.reset(new double(tilt));
int zoom;
if (GetWebcamParameter(fd.get(), V4L2_CID_ZOOM_ABSOLUTE, &zoom))
result.zoom.reset(new double(zoom));
SetResult(result.ToValue().release());
return true;
}
WebcamPrivateResetFunction::WebcamPrivateResetFunction() {
......@@ -54,7 +136,27 @@ bool WebcamPrivateResetFunction::RunImpl() {
api::webcam_private::Reset::Params::Create(*args_));
EXTENSION_FUNCTION_VALIDATE(params.get());
// TODO(zork): Reset the webcam state.
base::ScopedFD fd =
OpenWebcam(extension_id(), browser_context(), params->webcam_id);
if (!fd.is_valid()) {
SetError(kUnknownWebcam);
return false;
}
if (params->config.pan) {
struct v4l2_control v4l2_ctrl = {V4L2_CID_PAN_RESET};
HANDLE_EINTR(ioctl(fd.get(), VIDIOC_S_CTRL, &v4l2_ctrl));
}
if (params->config.tilt) {
struct v4l2_control v4l2_ctrl = {V4L2_CID_TILT_RESET};
HANDLE_EINTR(ioctl(fd.get(), VIDIOC_S_CTRL, &v4l2_ctrl));
}
if (params->config.zoom) {
const int kDefaultZoom = 100;
SetWebcamParameter(fd.get(), V4L2_CID_ZOOM_ABSOLUTE, kDefaultZoom);
}
return true;
}
......
......@@ -955,7 +955,7 @@
'browser/extensions/api/terminal/terminal_private_api.cc',
'browser/extensions/api/terminal/terminal_private_api.h',
'browser/extensions/api/webcam_private/webcam_private_api.h',
'browser/extensions/api/webcam_private/webcam_private_api.cc',
'browser/extensions/api/webcam_private/webcam_private_api_chromeos.cc',
'browser/extensions/updater/extension_cache_impl.cc',
'browser/extensions/updater/extension_cache_impl.h',
'browser/extensions/updater/local_extension_cache.cc',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment