| From 7fea1c3d52816732a250b66833e915e92e277180 Mon Sep 17 00:00:00 2001 |
| From: Sergey Senozhatsky <senozhatsky@chromium.org> |
| Date: Fri, 30 Apr 2021 21:10:12 +0900 |
| Subject: [PATCH] CHROMIUM: linux-headers: update headers with UVC 1.5 ROI |
| defines |
| |
| Add defines needed for UVC 1.5 ROI support. |
| |
| BUG=b:186835892 |
| TEST=emerge-hatch linux-headers and check headers |
| --- |
| include/uapi/linux/usb/video.h | 1 + |
| include/uapi/linux/v4l2-common.h | 8 ++++++++ |
| include/uapi/linux/v4l2-controls.h | 9 +++++++++ |
| 3 files changed, 18 insertions(+) |
| |
| diff --git a/include/uapi/linux/usb/video.h b/include/uapi/linux/usb/video.h |
| index ff6cc6cb4227..56259cc023da 100644 |
| --- a/include/uapi/linux/usb/video.h |
| +++ b/include/uapi/linux/usb/video.h |
| @@ -104,6 +104,7 @@ |
| #define UVC_CT_ROLL_ABSOLUTE_CONTROL 0x0f |
| #define UVC_CT_ROLL_RELATIVE_CONTROL 0x10 |
| #define UVC_CT_PRIVACY_CONTROL 0x11 |
| +#define UVC_CT_REGION_OF_INTEREST_CONTROL 0x14 |
| |
| /* A.9.5. Processing Unit Control Selectors */ |
| #define UVC_PU_CONTROL_UNDEFINED 0x00 |
| diff --git a/include/uapi/linux/v4l2-common.h b/include/uapi/linux/v4l2-common.h |
| index 4f7b892377cd..64154b575e71 100644 |
| --- a/include/uapi/linux/v4l2-common.h |
| +++ b/include/uapi/linux/v4l2-common.h |
| @@ -78,6 +78,14 @@ |
| #define V4L2_SEL_TGT_COMPOSE_BOUNDS 0x0102 |
| /* Current composing area plus all padding pixels */ |
| #define V4L2_SEL_TGT_COMPOSE_PADDED 0x0103 |
| +/* Current Region of Interest area */ |
| +#define V4L2_SEL_TGT_ROI 0x0200 |
| +/* Default Region of Interest area */ |
| +#define V4L2_SEL_TGT_ROI_DEFAULT 0x0201 |
| +/* Region of Interest minimum values */ |
| +#define V4L2_SEL_TGT_ROI_BOUNDS_MIN 0x0202 |
| +/* Region of Interest maximum values */ |
| +#define V4L2_SEL_TGT_ROI_BOUNDS_MAX 0x0203 |
| |
| /* Backward compatibility target definitions --- to be removed. */ |
| #define V4L2_SEL_TGT_CROP_ACTIVE V4L2_SEL_TGT_CROP |
| diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h |
| index e4ee10ee917d..53dcf5e6d6fb 100644 |
| --- a/include/uapi/linux/v4l2-controls.h |
| +++ b/include/uapi/linux/v4l2-controls.h |
| @@ -876,6 +876,15 @@ enum v4l2_auto_focus_range { |
| |
| #define V4L2_CID_PAN_SPEED (V4L2_CID_CAMERA_CLASS_BASE+32) |
| #define V4L2_CID_TILT_SPEED (V4L2_CID_CAMERA_CLASS_BASE+33) |
| +#define V4L2_CID_REGION_OF_INTEREST_AUTO (V4L2_CID_CAMERA_CLASS_BASE+34) |
| +#define V4L2_CID_REGION_OF_INTEREST_AUTO_EXPOSURE (1 << 0) |
| +#define V4L2_CID_REGION_OF_INTEREST_AUTO_IRIS (1 << 1) |
| +#define V4L2_CID_REGION_OF_INTEREST_AUTO_WHITE_BALANCE (1 << 2) |
| +#define V4L2_CID_REGION_OF_INTEREST_AUTO_FOCUS (1 << 3) |
| +#define V4L2_CID_REGION_OF_INTEREST_AUTO_FACE_DETECT (1 << 4) |
| +#define V4L2_CID_REGION_OF_INTEREST_AUTO_DETECT_AND_TRACK (1 << 5) |
| +#define V4L2_CID_REGION_OF_INTEREST_AUTO_IMAGE_STABILIZATION (1 << 6) |
| +#define V4L2_CID_REGION_OF_INTEREST_AUTO_HIGHER_QUALITY (1 << 7) |
| |
| /* FM Modulator class control IDs */ |
| |
| -- |
| 2.31.1.527.g47e6f16901-goog |
| |
