From patchwork Thu Mar 28 23:18:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Bauer via B4 Relay X-Patchwork-Id: 13609734 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 1359A6A332; Thu, 28 Mar 2024 23:18:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711667893; cv=none; b=CtXAzK5JWOgga28AtPNQh9bkhfLDFeXKElI4lYFpX0fHg8WlwGQR9t21+77l6hfoklmRLpmhk+HipG7YTGVKTA2xYhOIruGpKE19E0V1d3RtQyaCN7Rss/ulTDh/V5UKKB+Z7NtY7R31mAJzr/9PbXVJbMd/uDCZ7xYt/jLTccU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711667893; c=relaxed/simple; bh=40uh/wKUId8Vzuahx/WopdPsq9bSrg4TfoGpA2V/BrE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=jZs4cV6WjMw5FixdWdwcTwPw/+Aehn17m4FSAFIMfhD1dwTrdk0Cuw1gvJNHfqSMsqZb+0fpZB+gAEiOtAec49GKk15nlc1aGpYuf9rCL5j8iAif6yCkmruHGv4Yva3G0afMOrV+pAuRO/7y8NdOLwWJq0E8idFLQrdeCdhiZt0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Vq/XqNxA; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Vq/XqNxA" Received: by smtp.kernel.org (Postfix) with ESMTPS id ACDF9C433C7; Thu, 28 Mar 2024 23:18:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711667892; bh=40uh/wKUId8Vzuahx/WopdPsq9bSrg4TfoGpA2V/BrE=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=Vq/XqNxAxcS8T/IL2qp5bWeLxiWk1HyBxSo35IjC0it+KT4YT7VQxp0/1IknM6mfA h6h6u53CotkaZiyy6DPamNFFwmsxxuDOSd8cgEdtA1T/bjE/roCRVqh3fR510zlJAx BtTUKDuAXQpeJIvYAHpFBclm7RJ7s3uDjtbirKh/SKPlwIJAD4w39hTYebPSnZNJ5p pb++CJ9WwN+tfZOjIsxYEa21llVMKuN4GmMJo/bApLPLZibb66JqsQeJnCx4uYswTN dOAwsiYIAurPn43gQHSZA/489NF0q3egv/LoYya3Oz2OQxCqpFfEDeTuK3RkHyt3I/ 79f6gaBTxt+dA== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 98299CD1288; Thu, 28 Mar 2024 23:18:12 +0000 (UTC) From: John Bauer via B4 Relay Date: Thu, 28 Mar 2024 18:18:06 -0500 Subject: [PATCH 1/2] media: uvcvideo: UVC minimum relative pan/tilt/zoom speed fix Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240328-uvc-fix-relative-ptz-speed-v1-1-17373eb8b2be@securitylive.com> References: <20240328-uvc-fix-relative-ptz-speed-v1-0-17373eb8b2be@securitylive.com> In-Reply-To: <20240328-uvc-fix-relative-ptz-speed-v1-0-17373eb8b2be@securitylive.com> To: Laurent Pinchart , Mauro Carvalho Chehab Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linh.tp.vu@gmail.com, ribalda@chromium.org, soyer@irl.hu, John Bauer X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1711667891; l=2495; i=johnebgood@securitylive.com; s=20240325; h=from:subject:message-id; bh=QZxJ8IkQ+0S1QgP+EtdvdygUUbw+bFRKj/oMsKdGp5w=; b=BwFjVHPclp/6knYLtkp/FSdHxIvkJwLnwlzuViZ/kUwMkmbxJjNoJxvLls+p8kkgwkCwMyh2e yeZ3fKPtxEbAiHlrRVJmTQtN+5NU91hNGSDVVCUU59RDHQh7VlaigZT X-Developer-Key: i=johnebgood@securitylive.com; a=ed25519; pk=RN31Fmrxbidp1TwtZGNmQwTDjUWMPnewQJfA/ug2P9E= X-Endpoint-Received: by B4 Relay for johnebgood@securitylive.com/20240325 with auth_id=143 X-Original-From: John Bauer Reply-To: johnebgood@securitylive.com From: John Bauer The minimum UVC control value for the relative pan/tilt/zoom speeds cannot be probed as the implementation condenses the pan and tilt direction and speed into two 16 bit values. The minimum cannot be set at probe time because it is probed first and the maximum is not yet known. With this fix if a relative speed control is queried or set the minimum is set and checked based on the additive inverse of the maximum at that time. Signed-off-by: John Bauer --- drivers/media/usb/uvc/uvc_ctrl.c | 37 ++++++++++++++++++++++++++++++++++--- 1 file changed, 34 insertions(+), 3 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c index e59a463c2761..b389ab3ee05d 100644 --- a/drivers/media/usb/uvc/uvc_ctrl.c +++ b/drivers/media/usb/uvc/uvc_ctrl.c @@ -1322,9 +1322,25 @@ static int __uvc_query_v4l2_ctrl(struct uvc_video_chain *chain, break; } - if (ctrl->info.flags & UVC_CTRL_FLAG_GET_MIN) - v4l2_ctrl->minimum = mapping->get(mapping, UVC_GET_MIN, - uvc_ctrl_data(ctrl, UVC_CTRL_DATA_MIN)); + if (ctrl->info.flags & UVC_CTRL_FLAG_GET_MIN) { + switch (v4l2_ctrl->id) { + case V4L2_CID_ZOOM_CONTINUOUS: + case V4L2_CID_PAN_SPEED: + case V4L2_CID_TILT_SPEED: + /* + * For the relative speed implementation the minimum + * value cannot be probed so it becomes the additive + * inverse of maximum. + */ + v4l2_ctrl->minimum = -1 * mapping->get(mapping, UVC_GET_MAX, + uvc_ctrl_data(ctrl, UVC_CTRL_DATA_MAX)); + break; + default: + v4l2_ctrl->minimum = mapping->get(mapping, UVC_GET_MIN, + uvc_ctrl_data(ctrl, UVC_CTRL_DATA_MIN)); + break; + } + } if (ctrl->info.flags & UVC_CTRL_FLAG_GET_MAX) v4l2_ctrl->maximum = mapping->get(mapping, UVC_GET_MAX, @@ -1914,6 +1930,21 @@ int uvc_ctrl_set(struct uvc_fh *handle, uvc_ctrl_data(ctrl, UVC_CTRL_DATA_MIN)); max = mapping->get(mapping, UVC_GET_MAX, uvc_ctrl_data(ctrl, UVC_CTRL_DATA_MAX)); + + /* + * For the relative speed implementation the minimum + * value cannot be probed so it becomes the additive + * inverse of maximum. + */ + switch (xctrl->id) { + case V4L2_CID_ZOOM_CONTINUOUS: + case V4L2_CID_PAN_SPEED: + case V4L2_CID_TILT_SPEED: + min = max * -1; + default: + break; + } + step = mapping->get(mapping, UVC_GET_RES, uvc_ctrl_data(ctrl, UVC_CTRL_DATA_RES)); if (step == 0) From patchwork Thu Mar 28 23:18:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Bauer via B4 Relay X-Patchwork-Id: 13609733 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 1362182D66; Thu, 28 Mar 2024 23:18:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711667893; cv=none; b=kf66Un1oFS386bOC5bGODcKCs9cr5k8leOkkJ3VMVn9EeTB1oerJ4Xk0coxY4VT7QXQ/kXPbLJz7VzEwWqSiL77HVi0rEF3QYu1FTfOzZboBuHoBi540Ydlia7vMEwuNQtYvJPr1Dj2FvCZhBLn4NmsrmNBYL1ddfliub43ZTtg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711667893; c=relaxed/simple; bh=ufR+0iHCmEICheDCukK6osbbIBOdgkBNn3yKED5Aw2E=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=ShZ2vhhPqWyzxBDyacrwUJA8DW0jPJ5eZeCBg8iq41qMQq1LjJvEEqNS6byAOfr5sJD1UFQ0xnAkntHWIWvPlu1gZTuX8AlL3MYCy9W4F6eoQhHgZOiTfxkyq0sajDPmKLfiBahFSPSbxka1znkHX3A6AFtbF+5Fq0ueSbq2Aqw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=piSpR857; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="piSpR857" Received: by smtp.kernel.org (Postfix) with ESMTPS id BEDCCC43394; Thu, 28 Mar 2024 23:18:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711667892; bh=ufR+0iHCmEICheDCukK6osbbIBOdgkBNn3yKED5Aw2E=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=piSpR857SPHOLL5t/cpgDNsoTLyhQubz359xYKrG+jIcd7bKxthfWV+aXB5ln9uAE z1ZTl8vGmoeWf2KhF281yPql0JN8Ce9ovn6w4CoVIelRIXhvoEZm9BcXyHZ8bKQUzN wNnxUvcqy1LxoJzITptvK4FNOuZ8tBLbUg+DZjrenAbeaEyeMnUDLebWZF5o5GWf2v s7xIOgZKCo+JTnqr6zgqjuNPp20lxE7Di1rEN+Kj1utMiikSZDpH1X9oQp6iUcCo4q +k3SZlN0Om/w92TsCF60eO+wiAebbMAxoADfBj6sTY/QXeXJvuFLK4kFDBcHG9fpWn pzJqOxH5nCSLg== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id AEBADCD128D; Thu, 28 Mar 2024 23:18:12 +0000 (UTC) From: John Bauer via B4 Relay Date: Thu, 28 Mar 2024 18:18:07 -0500 Subject: [PATCH 2/2] media: uvcvideo: UVC minimum relative pan/tilt/zoom speed fix Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240328-uvc-fix-relative-ptz-speed-v1-2-17373eb8b2be@securitylive.com> References: <20240328-uvc-fix-relative-ptz-speed-v1-0-17373eb8b2be@securitylive.com> In-Reply-To: <20240328-uvc-fix-relative-ptz-speed-v1-0-17373eb8b2be@securitylive.com> To: Laurent Pinchart , Mauro Carvalho Chehab Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, linh.tp.vu@gmail.com, ribalda@chromium.org, soyer@irl.hu, John Bauer X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1711667891; l=2237; i=johnebgood@securitylive.com; s=20240325; h=from:subject:message-id; bh=XaPSPVobhTGsOxP+SRJcTVrPmARlAP4ikC9wTaKg0Fw=; b=DAxSw7/KC1Ex96mac6VlcslTse6QSo8x/qs+vdoNIONBKk4gX417XmN7X3tUGfZEQLjLjIPYh JF5NO8Bkd3yAoRt3qihsFZlCJ4onvkikTHXSH0AkVt/iVxj47/82DDL X-Developer-Key: i=johnebgood@securitylive.com; a=ed25519; pk=RN31Fmrxbidp1TwtZGNmQwTDjUWMPnewQJfA/ug2P9E= X-Endpoint-Received: by B4 Relay for johnebgood@securitylive.com/20240325 with auth_id=143 X-Original-From: John Bauer Reply-To: johnebgood@securitylive.com From: John Bauer Made recommended changes from Ricardo. I explored the case where the minimum could be > 0 but less than the maximum. If this were to occur the range of -maximum to maximum would still apply correctly however there would be a range from -min to min that would possibly not apply. It would be possible to capture the probed minimum and check against that when setting the controls. Signed-off-by: John Bauer --- drivers/media/usb/uvc/uvc_ctrl.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c index b389ab3ee05d..04300a782c81 100644 --- a/drivers/media/usb/uvc/uvc_ctrl.c +++ b/drivers/media/usb/uvc/uvc_ctrl.c @@ -1322,6 +1322,10 @@ static int __uvc_query_v4l2_ctrl(struct uvc_video_chain *chain, break; } + if (ctrl->info.flags & UVC_CTRL_FLAG_GET_MAX) + v4l2_ctrl->maximum = mapping->get(mapping, UVC_GET_MAX, + uvc_ctrl_data(ctrl, UVC_CTRL_DATA_MAX)); + if (ctrl->info.flags & UVC_CTRL_FLAG_GET_MIN) { switch (v4l2_ctrl->id) { case V4L2_CID_ZOOM_CONTINUOUS: @@ -1332,8 +1336,7 @@ static int __uvc_query_v4l2_ctrl(struct uvc_video_chain *chain, * value cannot be probed so it becomes the additive * inverse of maximum. */ - v4l2_ctrl->minimum = -1 * mapping->get(mapping, UVC_GET_MAX, - uvc_ctrl_data(ctrl, UVC_CTRL_DATA_MAX)); + v4l2_ctrl->minimum = -v4l2_ctrl->maximum; break; default: v4l2_ctrl->minimum = mapping->get(mapping, UVC_GET_MIN, @@ -1342,10 +1345,6 @@ static int __uvc_query_v4l2_ctrl(struct uvc_video_chain *chain, } } - if (ctrl->info.flags & UVC_CTRL_FLAG_GET_MAX) - v4l2_ctrl->maximum = mapping->get(mapping, UVC_GET_MAX, - uvc_ctrl_data(ctrl, UVC_CTRL_DATA_MAX)); - if (ctrl->info.flags & UVC_CTRL_FLAG_GET_RES) v4l2_ctrl->step = mapping->get(mapping, UVC_GET_RES, uvc_ctrl_data(ctrl, UVC_CTRL_DATA_RES)); @@ -1940,7 +1939,7 @@ int uvc_ctrl_set(struct uvc_fh *handle, case V4L2_CID_ZOOM_CONTINUOUS: case V4L2_CID_PAN_SPEED: case V4L2_CID_TILT_SPEED: - min = max * -1; + min = -max; default: break; }