Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(491)

Unified Diff: media/capture/video/linux/v4l2_capture_delegate.cc

Issue 2364543002: Revert of Image Capture Linux/CrOs: wire some capabilities set/get (Closed)
Patch Set: Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/capture/video/linux/v4l2_capture_delegate.cc
diff --git a/media/capture/video/linux/v4l2_capture_delegate.cc b/media/capture/video/linux/v4l2_capture_delegate.cc
index f665393c5e3682d0eaa9f326a5c2ad295ddc10af..d846e416b5153c3b0ffa8d326b8ac83d49b5b0bc 100644
--- a/media/capture/video/linux/v4l2_capture_delegate.cc
+++ b/media/capture/video/linux/v4l2_capture_delegate.cc
@@ -328,80 +328,6 @@
take_photo_callbacks_.push(std::move(callback));
}
-void V4L2CaptureDelegate::GetPhotoCapabilities(
- VideoCaptureDevice::GetPhotoCapabilitiesCallback callback) {
- DCHECK(v4l2_task_runner_->BelongsToCurrentThread());
-
- 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 * 100;
- photo_capabilities->zoom->min = zoom_range.minimum * 100;
- }
- 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 * 100;
-
- 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;
- }
-
- photo_capabilities->exposure_mode = mojom::MeteringMode::NONE;
- v4l2_control exposure_current = {};
- exposure_current.id = V4L2_CID_EXPOSURE_AUTO;
- if (HANDLE_EINTR(ioctl(device_fd_.get(), VIDIOC_G_CTRL, &exposure_current)) >=
- 0) {
- photo_capabilities->exposure_mode =
- exposure_current.value == V4L2_EXPOSURE_MANUAL
- ? mojom::MeteringMode::MANUAL
- : mojom::MeteringMode::CONTINUOUS;
- }
-
- 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->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;
- callback.Run(std::move(photo_capabilities));
-}
-
-void V4L2CaptureDelegate::SetPhotoOptions(
- mojom::PhotoSettingsPtr settings,
- VideoCaptureDevice::SetPhotoOptionsCallback callback) {
- if (settings->has_zoom) {
- v4l2_control zoom_current = {};
- zoom_current.id = V4L2_CID_ZOOM_ABSOLUTE;
- zoom_current.value = settings->zoom / 100;
- if (HANDLE_EINTR(ioctl(device_fd_.get(), VIDIOC_S_CTRL, &zoom_current)) < 0)
- DLOG(ERROR) << "Error setting zoom value to " << (settings->zoom / 100);
- }
- callback.Run(true);
-}
-
void V4L2CaptureDelegate::SetRotation(int rotation) {
DCHECK(v4l2_task_runner_->BelongsToCurrentThread());
DCHECK(rotation >= 0 && rotation < 360 && rotation % 90 == 0);
« no previous file with comments | « media/capture/video/linux/v4l2_capture_delegate.h ('k') | media/capture/video/linux/video_capture_device_linux.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698