From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C37451FCCFB for ; Wed, 18 Dec 2024 21:02:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734555762; cv=none; b=L4dbfDUvWsGtLPAHnIkVitquVzmjExKgsclXLT5kdZ6Iy0zZmTT62/oqkgJsi1uUT0KswKng6qrD+5zXhhCAcGKSUB5fhcYBApJ4w+rqcOLJtjbTeMvPSSCprLbNxNNYCHmSAGh1uqadocZ4mprngqegbC3kS0zCwzjI/hQuRUI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734555762; c=relaxed/simple; bh=CpMwj9TMpIFn7KyKM9x7JmJAbkRDzhQFpE6B55UMyEM=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=ghaaleVn7fDmRHTUpvYDPhTeoFg57Oz72jlK5TmezoaWmPjDq+tWUln9GDfUCFqYiOeOfy5d6adyd7t69MiwLIxAOygmYOvUveRtmpPCisid8/7ua7FbqVJS1jBNVO1aUHXuDbIT/QMcdd5fZuzKQqLtWByr4kHj+n2dTUS/dSQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=ZmvLVlay; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="ZmvLVlay" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1734555759; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KurRWUwQUwzBDr/KoRRtoTl5MY1mFC93K7J+MA0MFuE=; b=ZmvLVlaybGMviHY1RcrWfsjDb+sSlNhTwZSdxh9MNwoW6uD17SlAv94mk197q/fxUpROmN fKpvFKD3gQfr2E13kwRMW8uVkKIr7vSJkIFNjjvk2eQucWb9a+QWKnJzeFcT4FX500nvmG SWLHL4jhRPzsKrTnB7bvynIXdo3WSzs= Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-147-egMkJmV-MD6arEUaDtah_g-1; Wed, 18 Dec 2024 16:02:38 -0500 X-MC-Unique: egMkJmV-MD6arEUaDtah_g-1 X-Mimecast-MFC-AGG-ID: egMkJmV-MD6arEUaDtah_g Received: by mail-ed1-f70.google.com with SMTP id 4fb4d7f45d1cf-5d3bf8874dbso72188a12.2 for ; Wed, 18 Dec 2024 13:02:38 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734555757; x=1735160557; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=KurRWUwQUwzBDr/KoRRtoTl5MY1mFC93K7J+MA0MFuE=; b=D0uA0KJzRuSZZdLiTGX2O/7/2oWJCB9M8z5SKiQeBxDjxWSkLW52tQh5fVy4NejNV1 PUSGH1xitce3BVMhFa8CPDy8jjPYflhxXZhUvvan9zwjLugciyX9bcfC9zK/KKIWSlAk TpvccCktUEPYpIctrGvikWmkvCyJJC2FHPLU3zpE2X6TPG64ztMSKNlECzrDLWbUx/nv 2GeioJRZvx/EuVDc93EcZ58kVcB+B7rX7a/U7gF0Bb25TlK0tCjPAtKceAXgkEfhroNO 0BqRiCme6ftC876vYlLkOHJEcXndJikDa1H1NnnmzKcDGOqmpRqhKgCYdjRXykx/t/ST WPYQ== X-Forwarded-Encrypted: i=1; AJvYcCVcNsk2yeIQcTTGhSSxasqfNtVXhjWfSOP7iwp9pIkXwViiVHHmF9PKW96iVreBeSNvBAhkZuqbnRwd8cM=@vger.kernel.org X-Gm-Message-State: AOJu0Yz75wp6cm9j6Oasfx0FMntSnsWCkBVyAzuvbRsPJugUzfQfVeLa QqMUWKYqbR1UpL1yi0SIQlJ+e2IqMuB81AzQuyLYY/F4GP6k65aGUE4Lz4O6M5b+bzujIcZb+2I S97cbQ1oXHRgKx6g9n6OUU2u9wYXtaIjvvdqRvzuJImotxQTdum4Nq2Jql/H4xA== X-Gm-Gg: ASbGncv4K5Fbnwdecb4vQHLFJkdYHUNxcUGFuu+aOw+i0jX6w6KCP8PYV5tx05ijy6D Y9RKodiNTpNugL/GxR/WGNlkxEs9YgrjnSttEn4iQoKpZF3UWV/kTxpWOR5NR17o3VZd5o8cNe0 jkDwSz80cSoSo93dcx4r7j0mm/rpyLfOvAgAv0erF5tkZp0i0DFALCA4kOaMEG1TD+w5xitvqhW JA0qtLA5LAoZ3C3Dr7tVbx0CAofEUq2FJ0SnV+VAY5IrfsmqTQ+oX+MoOJWF4nELgodoey5Trcc zvDrG+U7Co0nA7DmZ1K/NB0StF7QXj+fCt2FFX5/kWDQHL+Zoch+FkxokVALxiYM0p1zA+N47I8 ADwCO883Zk4fcyWM1iz1wEGloSLpEmbk= X-Received: by 2002:a05:6402:238c:b0:5d0:e570:508d with SMTP id 4fb4d7f45d1cf-5d7ee3d5b4fmr2914675a12.17.1734555757203; Wed, 18 Dec 2024 13:02:37 -0800 (PST) X-Google-Smtp-Source: AGHT+IFmOGdbjW9C0BYh6GDxyBcm15TfL8ntaSZ0y+kHAn7ezLEpIFRmsauQ/njfasKhmYz4mB2Fdg== X-Received: by 2002:a05:6402:238c:b0:5d0:e570:508d with SMTP id 4fb4d7f45d1cf-5d7ee3d5b4fmr2914658a12.17.1734555756798; Wed, 18 Dec 2024 13:02:36 -0800 (PST) Received: from ?IPV6:2001:1c00:c32:7800:5bfa:a036:83f0:f9ec? (2001-1c00-0c32-7800-5bfa-a036-83f0-f9ec.cable.dynamic.v6.ziggo.nl. [2001:1c00:c32:7800:5bfa:a036:83f0:f9ec]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5d652ae128fsm5680863a12.46.2024.12.18.13.02.34 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 18 Dec 2024 13:02:35 -0800 (PST) Message-ID: <9837f93e-cc45-4927-b1bf-e3351400e699@redhat.com> Date: Wed, 18 Dec 2024 22:02:34 +0100 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v16 17/18] media: uvcvideo: implement UVC v1.5 ROI To: Ricardo Ribalda , Laurent Pinchart , Mauro Carvalho Chehab , Sakari Ailus , Hans Verkuil Cc: Yunke Cao , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, Yunke Cao References: <20241210-uvc-roi-v16-0-e8201f7e8e57@chromium.org> <20241210-uvc-roi-v16-17-e8201f7e8e57@chromium.org> Content-Language: en-US, nl From: Hans de Goede In-Reply-To: <20241210-uvc-roi-v16-17-e8201f7e8e57@chromium.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit p.s. On 10-Dec-24 10:42 AM, Ricardo Ribalda wrote: > From: Yunke Cao > > Implement support for ROI as described in UVC 1.5: > 4.2.2.1.20 Digital Region of Interest (ROI) Control > > ROI control is implemented using V4L2 control API as > two UVC-specific controls: > V4L2_CID_UVC_REGION_OF_INTEREST_RECT and > V4L2_CID_UVC_REGION_OF_INTEREST_AUTO. > > Reviewed-by: Ricardo Ribalda > Signed-off-by: Yunke Cao > Reviewed-by: Yunke Cao > Tested-by: Yunke Cao I just noticed this is missing a: Signed-off-by: Ricardo Ribalda Ricardo, I assume it is ok if we add that while merging this series? Regards, Hans > --- > drivers/media/usb/uvc/uvc_ctrl.c | 81 ++++++++++++++++++++++++++++++++++++++ > drivers/media/usb/uvc/uvcvideo.h | 7 ++++ > include/uapi/linux/usb/video.h | 1 + > include/uapi/linux/uvcvideo.h | 13 ++++++ > include/uapi/linux/v4l2-controls.h | 7 ++++ > 5 files changed, 109 insertions(+) > > diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c > index dd6129becf58..86ea24b10b54 100644 > --- a/drivers/media/usb/uvc/uvc_ctrl.c > +++ b/drivers/media/usb/uvc/uvc_ctrl.c > @@ -358,6 +358,24 @@ static const struct uvc_control_info uvc_ctrls[] = { > .flags = UVC_CTRL_FLAG_GET_CUR > | UVC_CTRL_FLAG_AUTO_UPDATE, > }, > + /* > + * UVC_CTRL_FLAG_AUTO_UPDATE is needed because the RoI may get updated > + * by sensors. > + * "This RoI should be the same as specified in most recent SET_CUR > + * except in the case where the ‘Auto Detect and Track’ and/or > + * ‘Image Stabilization’ bit have been set." > + * 4.2.2.1.20 Digital Region of Interest (ROI) Control > + */ > + { > + .entity = UVC_GUID_UVC_CAMERA, > + .selector = UVC_CT_REGION_OF_INTEREST_CONTROL, > + .index = 21, > + .size = 10, > + .flags = UVC_CTRL_FLAG_SET_CUR | UVC_CTRL_FLAG_GET_CUR > + | UVC_CTRL_FLAG_GET_MIN | UVC_CTRL_FLAG_GET_MAX > + | UVC_CTRL_FLAG_GET_DEF > + | UVC_CTRL_FLAG_AUTO_UPDATE, > + }, > }; > > static const u32 uvc_control_classes[] = { > @@ -603,6 +621,44 @@ static const struct uvc_control_mapping *uvc_ctrl_filter_plf_mapping( > return out_mapping; > } > > +static int uvc_get_rect(struct uvc_control_mapping *mapping, u8 query, > + const void *uvc_in, size_t v4l2_size, void *v4l2_out) > +{ > + const struct uvc_rect *uvc_rect = uvc_in; > + struct v4l2_rect *v4l2_rect = v4l2_out; > + > + if (WARN_ON(v4l2_size != sizeof(struct v4l2_rect))) > + return -EINVAL; > + > + if (uvc_rect->left > uvc_rect->right || > + uvc_rect->top > uvc_rect->bottom) > + return -EIO; > + > + v4l2_rect->top = uvc_rect->top; > + v4l2_rect->left = uvc_rect->left; > + v4l2_rect->height = uvc_rect->bottom - uvc_rect->top + 1; > + v4l2_rect->width = uvc_rect->right - uvc_rect->left + 1; > + > + return 0; > +} > + > +static int uvc_set_rect(struct uvc_control_mapping *mapping, size_t v4l2_size, > + const void *v4l2_in, void *uvc_out) > +{ > + struct uvc_rect *uvc_rect = uvc_out; > + const struct v4l2_rect *v4l2_rect = v4l2_in; > + > + if (WARN_ON(v4l2_size != sizeof(struct v4l2_rect))) > + return -EINVAL; > + > + uvc_rect->top = min(0xffff, v4l2_rect->top); > + uvc_rect->left = min(0xffff, v4l2_rect->left); > + uvc_rect->bottom = min(0xffff, v4l2_rect->top + v4l2_rect->height - 1); > + uvc_rect->right = min(0xffff, v4l2_rect->left + v4l2_rect->width - 1); > + > + return 0; > +} > + > static const struct uvc_control_mapping uvc_ctrl_mappings[] = { > { > .id = V4L2_CID_BRIGHTNESS, > @@ -897,6 +953,28 @@ static const struct uvc_control_mapping uvc_ctrl_mappings[] = { > .selector = UVC_PU_POWER_LINE_FREQUENCY_CONTROL, > .filter_mapping = uvc_ctrl_filter_plf_mapping, > }, > + { > + .id = V4L2_CID_UVC_REGION_OF_INTEREST_RECT, > + .entity = UVC_GUID_UVC_CAMERA, > + .selector = UVC_CT_REGION_OF_INTEREST_CONTROL, > + .size = sizeof(struct uvc_rect) * 8, > + .offset = 0, > + .v4l2_type = V4L2_CTRL_TYPE_RECT, > + .data_type = UVC_CTRL_DATA_TYPE_RECT, > + .get = uvc_get_rect, > + .set = uvc_set_rect, > + .name = "Region Of Interest Rectangle", > + }, > + { > + .id = V4L2_CID_UVC_REGION_OF_INTEREST_AUTO, > + .entity = UVC_GUID_UVC_CAMERA, > + .selector = UVC_CT_REGION_OF_INTEREST_CONTROL, > + .size = 16, > + .offset = 64, > + .v4l2_type = V4L2_CTRL_TYPE_BITMASK, > + .data_type = UVC_CTRL_DATA_TYPE_BITMASK, > + .name = "Region Of Interest Auto Controls", > + }, > }; > > /* ------------------------------------------------------------------------ > @@ -1473,6 +1551,9 @@ static int __uvc_queryctrl_boundaries(struct uvc_video_chain *chain, > > static size_t uvc_mapping_v4l2_size(struct uvc_control_mapping *mapping) > { > + if (mapping->v4l2_type == V4L2_CTRL_TYPE_RECT) > + return sizeof(struct v4l2_rect); > + > if (uvc_ctrl_mapping_is_compound(mapping)) > return DIV_ROUND_UP(mapping->size, 8); > > diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h > index 8aca1a2fe587..17b79108599f 100644 > --- a/drivers/media/usb/uvc/uvcvideo.h > +++ b/drivers/media/usb/uvc/uvcvideo.h > @@ -538,6 +538,13 @@ struct uvc_device_info { > u16 uvc_version; > }; > > +struct uvc_rect { > + u16 top; > + u16 left; > + u16 bottom; > + u16 right; > +} __packed; > + > struct uvc_status_streaming { > u8 button; > } __packed; > diff --git a/include/uapi/linux/usb/video.h b/include/uapi/linux/usb/video.h > index 2ff0e8a3a683..2afb4420e6c4 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/uvcvideo.h b/include/uapi/linux/uvcvideo.h > index f86185456dc5..cbe15bca9569 100644 > --- a/include/uapi/linux/uvcvideo.h > +++ b/include/uapi/linux/uvcvideo.h > @@ -16,6 +16,7 @@ > #define UVC_CTRL_DATA_TYPE_BOOLEAN 3 > #define UVC_CTRL_DATA_TYPE_ENUM 4 > #define UVC_CTRL_DATA_TYPE_BITMASK 5 > +#define UVC_CTRL_DATA_TYPE_RECT 6 > > /* Control flags */ > #define UVC_CTRL_FLAG_SET_CUR (1 << 0) > @@ -38,6 +39,18 @@ > > #define UVC_MENU_NAME_LEN 32 > > +/* V4L2 driver-specific controls */ > +#define V4L2_CID_UVC_REGION_OF_INTEREST_RECT (V4L2_CID_USER_UVC_BASE + 1) > +#define V4L2_CID_UVC_REGION_OF_INTEREST_AUTO (V4L2_CID_USER_UVC_BASE + 2) > +#define V4L2_UVC_REGION_OF_INTEREST_AUTO_EXPOSURE (1 << 0) > +#define V4L2_UVC_REGION_OF_INTEREST_AUTO_IRIS (1 << 1) > +#define V4L2_UVC_REGION_OF_INTEREST_AUTO_WHITE_BALANCE (1 << 2) > +#define V4L2_UVC_REGION_OF_INTEREST_AUTO_FOCUS (1 << 3) > +#define V4L2_UVC_REGION_OF_INTEREST_AUTO_FACE_DETECT (1 << 4) > +#define V4L2_UVC_REGION_OF_INTEREST_AUTO_DETECT_AND_TRACK (1 << 5) > +#define V4L2_UVC_REGION_OF_INTEREST_AUTO_IMAGE_STABILIZATION (1 << 6) > +#define V4L2_UVC_REGION_OF_INTEREST_AUTO_HIGHER_QUALITY (1 << 7) > + > struct uvc_menu_info { > __u32 value; > __u8 name[UVC_MENU_NAME_LEN]; > diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h > index 974fd254e573..72e32814ea83 100644 > --- a/include/uapi/linux/v4l2-controls.h > +++ b/include/uapi/linux/v4l2-controls.h > @@ -215,6 +215,13 @@ enum v4l2_colorfx { > */ > #define V4L2_CID_USER_THP7312_BASE (V4L2_CID_USER_BASE + 0x11c0) > > +/* > + * The base for the uvc driver controls. > + * See linux/uvcvideo.h for the list of controls. > + * We reserve 64 controls for this driver. > + */ > +#define V4L2_CID_USER_UVC_BASE (V4L2_CID_USER_BASE + 0x11e0) > + > /* MPEG-class control IDs */ > /* The MPEG controls are applicable to all codec controls > * and the 'MPEG' part of the define is historical */ >