{"id":21266,"url":"https://patchwork.libcamera.org/api/1.1/patches/21266/?format=json","web_url":"https://patchwork.libcamera.org/patch/21266/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<01020191edb91301-2a501bd0-5f12-4ba1-aa97-e1d610670d26-000000@eu-west-1.amazonses.com>","date":"2024-09-13T23:30:14","name":"[v2] libcamera: pipeline: uvcvideo: Retrieve v4l2 device control information","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"d33592676eb070615234bbfb56281fc3efd164d3","submitter":{"id":207,"url":"https://patchwork.libcamera.org/api/1.1/people/207/?format=json","name":"Cláudio Paulo","email":"claudio.paulo@makewise.pt"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/21266/mbox/","series":[{"id":4593,"url":"https://patchwork.libcamera.org/api/1.1/series/4593/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4593","date":"2024-09-13T23:30:14","name":"[v2] libcamera: pipeline: uvcvideo: Retrieve v4l2 device control information","version":2,"mbox":"https://patchwork.libcamera.org/series/4593/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/21266/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/21266/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 0F216C3257\n\tfor ;\n\tFri, 13 Sep 2024 23:30:19 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 4E731634F8;\n\tSat, 14 Sep 2024 01:30:17 +0200 (CEST)","from a7-20.smtp-out.eu-west-1.amazonses.com\n\t(a7-20.smtp-out.eu-west-1.amazonses.com [54.240.7.20])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id BD1DA634F2\n\tfor ;\n\tSat, 14 Sep 2024 01:30:15 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (2048-bit key;\n\tunprotected) header.d=makewise.pt header.i=@makewise.pt\n\theader.b=\"XwlOaDDJ\"; dkim=pass (1024-bit key;\n\tunprotected) header.d=amazonses.com header.i=@amazonses.com\n\theader.b=\"SZNSTnXX\"; dkim-atps=neutral","DKIM-Signature":["v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple;\n\ts=4ymqmigrodjwq5luewph2eedidgwlpqq; d=makewise.pt; t=1726270215;\n\th=From:To:Cc:Subject:Date:Message-Id:MIME-Version:Content-Type:Content-Transfer-Encoding;\n\tbh=UfEh2Pg+TDvCbm+LM6xaT3IDhT3RDuq2+YrMHiJvq6M=;\n\tb=XwlOaDDJoZHhR48ONi98ZH180kz/NRKwl3bxTbEO5m8CSLlijRC89yxdIeWbTQ6K\n\tJCxyY1FtwmYVOWvpSvgEXjKlQ0V+eQEu+jA+EdV0TguDPWLRNHO3ikOWOhdU7mUWQWh\n\t1q/OBNzFSVhQmPiGlqE0WUl+8/oZkWGHl4FHXSwZd98dv/4+LQV69oBxzkMy52KmYPq\n\tUTwWm2Byppl0maTAnavqQSBPVxoBHE03rt5hbG0D/U/gPF/bv4RqB2fO7JU61mxihmW\n\tErw6QXDMXjAqAjOs3Gbu6Y6QWfHN87KVTnvbgdmVbdXmCeIFZw3g28UeHhguMqqrEoQ\n\thTN+3zdFAA==","v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple;\n\ts=uku4taia5b5tsbglxyj6zym32efj7xqv; d=amazonses.com; t=1726270215;\n\th=From:To:Cc:Subject:Date:Message-Id:MIME-Version:Content-Type:Content-Transfer-Encoding:Feedback-ID;\n\tbh=UfEh2Pg+TDvCbm+LM6xaT3IDhT3RDuq2+YrMHiJvq6M=;\n\tb=SZNSTnXXn8eWfV/n/jXAKCXuY0JVwsKkK5hcvPb2ck1p/vAiUCRA/XAgJ3Vksd7w\n\toIWrdm+8wtQizMq5/G2Uok17Nu7ZZvp7Saj/qfQAVIgPNLv/S03tgBeRlFE3fubrTIv\n\tY3INYf3TkemiEOkEMk1SLs+JFw0t/BE6HJ5P051M="],"From":"=?utf-8?q?Cl=C3=A1udio_Paulo?= ","To":"libcamera-devel@lists.libcamera.org","Cc":"=?utf-8?q?Cl=C3=A1udio_Paulo?= ","Subject":"[PATCH v2] libcamera: pipeline: uvcvideo: Retrieve v4l2 device\n\tcontrol information","Date":"Fri, 13 Sep 2024 23:30:14 +0000","Message-ID":"<01020191edb91301-2a501bd0-5f12-4ba1-aa97-e1d610670d26-000000@eu-west-1.amazonses.com>","X-Mailer":"git-send-email 2.34.1","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","Feedback-ID":"::1.eu-west-1.z8xjvhxVxUk+kM5mx7i/KMS/a2avhcAXFe/noI67NVQ=:AmazonSES","X-SES-Outgoing":"2024.09.13-54.240.7.20","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Populate frame metadata by using V4L2Device::getControls() to get\nthe values for all supported controls on each frame.\n\nSigned-off-by: Cláudio Paulo \n---\nActually mapping the control values to libcamera ranges now.\n\n include/linux/v4l2-controls.h | 4 +\n src/libcamera/pipeline/uvcvideo/uvcvideo.cpp | 115 ++++++++++++++++++-\n 2 files changed, 115 insertions(+), 4 deletions(-)","diff":"diff --git a/include/linux/v4l2-controls.h b/include/linux/v4l2-controls.h\nindex 882a8180..1ac85507 100644\n--- a/include/linux/v4l2-controls.h\n+++ b/include/linux/v4l2-controls.h\n@@ -994,6 +994,10 @@ enum v4l2_exposure_auto_type {\n #define V4L2_CID_FOCUS_ABSOLUTE\t\t\t(V4L2_CID_CAMERA_CLASS_BASE+10)\n #define V4L2_CID_FOCUS_RELATIVE\t\t\t(V4L2_CID_CAMERA_CLASS_BASE+11)\n #define V4L2_CID_FOCUS_AUTO\t\t\t(V4L2_CID_CAMERA_CLASS_BASE+12)\n+enum v4l2_focus_auto_type {\n+\tV4L2_FOCUS_MANUAL = 0,\n+\tV4L2_FOCUS_AUTO = 1\n+};\n \n #define V4L2_CID_ZOOM_ABSOLUTE\t\t\t(V4L2_CID_CAMERA_CLASS_BASE+13)\n #define V4L2_CID_ZOOM_RELATIVE\t\t\t(V4L2_CID_CAMERA_CLASS_BASE+14)\ndiff --git a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\nindex 6b32fa18..ad6468b5 100644\n--- a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\n+++ b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\n@@ -333,8 +333,8 @@ int PipelineHandlerUVC::processControl(ControlList *controls, unsigned int id,\n \n \tcase V4L2_CID_EXPOSURE_AUTO: {\n \t\tint32_t ivalue = value.get()\n-\t\t\t ? V4L2_EXPOSURE_APERTURE_PRIORITY\n-\t\t\t : V4L2_EXPOSURE_MANUAL;\n+\t\t\t\t\t ? V4L2_EXPOSURE_APERTURE_PRIORITY\n+\t\t\t\t\t : V4L2_EXPOSURE_MANUAL;\n \t\tcontrols->set(V4L2_CID_EXPOSURE_AUTO, ivalue);\n \t\tbreak;\n \t}\n@@ -750,10 +750,117 @@ void UVCCameraData::addControl(uint32_t cid, const ControlInfo &v4l2Info,\n void UVCCameraData::bufferReady(FrameBuffer *buffer)\n {\n \tRequest *request = buffer->request();\n+\tControlList *metadata = &request->metadata();\n \n \t/* \\todo Use the UVC metadata to calculate a more precise timestamp */\n-\trequest->metadata().set(controls::SensorTimestamp,\n-\t\t\t\tbuffer->metadata().timestamp);\n+\tmetadata->set(controls::SensorTimestamp, buffer->metadata().timestamp);\n+\n+\t/* Retrieve control as reported by the device. */\n+\tstd::vector ids;\n+\tfor (const auto &[controlId, _] : video_->controls()) {\n+\t\tswitch (uint32_t cid = controlId->id()) {\n+\t\tcase V4L2_CID_BRIGHTNESS:\n+\t\tcase V4L2_CID_CONTRAST:\n+\t\tcase V4L2_CID_SATURATION:\n+\t\tcase V4L2_CID_EXPOSURE_AUTO:\n+\t\tcase V4L2_CID_EXPOSURE_ABSOLUTE:\n+\t\tcase V4L2_CID_GAIN:\n+\t\tcase V4L2_CID_FOCUS_ABSOLUTE:\n+\t\tcase V4L2_CID_FOCUS_AUTO:\n+\t\t\tids.push_back(cid);\n+\t\t\tbreak;\n+\t\tdefault:;\n+\t\t}\n+\t}\n+\n+\t/*\n+\t * See UVCCameraData::addControl() for explanations of the different\n+\t * value mappings.\n+\t */\n+\tControlList deviceControls = video_->getControls(ids);\n+\tfor (const auto &[cid, value] : deviceControls) {\n+\t\tswitch (cid) {\n+\t\tcase V4L2_CID_BRIGHTNESS: {\n+\t\t\tControlInfo v4l2Info = video_->controls().at(cid);\n+\t\t\tint32_t min = v4l2Info.min().get();\n+\t\t\tint32_t def = v4l2Info.def().get();\n+\t\t\tint32_t max = v4l2Info.max().get();\n+\n+\t\t\tfloat scale = std::max(max - def, def - min);\n+\t\t\tint ivalue = (value.get() - def) / scale;\n+\t\t\tmetadata->set(controls::Brightness, ivalue);\n+\t\t\tbreak;\n+\t\t}\n+\n+\t\tcase V4L2_CID_GAIN:\n+\t\tcase V4L2_CID_CONTRAST: {\n+\t\t\tControlInfo v4l2Info = video_->controls().at(cid);\n+\t\t\tint32_t min = v4l2Info.min().get();\n+\t\t\tint32_t def = v4l2Info.def().get();\n+\t\t\tint32_t max = v4l2Info.max().get();\n+\n+\t\t\tfloat m = (4.0f - 1.0f) / (max - def);\n+\t\t\tfloat p = 1.0f - m * def;\n+\n+\t\t\tif (m * min + p < 0.5f) {\n+\t\t\t\tm = (1.0f - 0.5f) / (def - min);\n+\t\t\t\tp = 1.0f - m * def;\n+\t\t\t}\n+\n+\t\t\tif (cid == V4L2_CID_GAIN)\n+\t\t\t\tmetadata->set(controls::AnalogueGain, m * value.get() + p);\n+\t\t\telse if (cid == V4L2_CID_CONTRAST)\n+\t\t\t\tmetadata->set(controls::Contrast, m * value.get() + p);\n+\t\t\tbreak;\n+\t\t}\n+\n+\t\tcase V4L2_CID_SATURATION: {\n+\t\t\tControlInfo v4l2Info = video_->controls().at(cid);\n+\t\t\tint32_t min = v4l2Info.min().get();\n+\t\t\tint32_t def = v4l2Info.def().get();\n+\n+\t\t\tfloat scale = def - min;\n+\t\t\tmetadata->set(controls::Saturation, (value.get() - min) / scale);\n+\t\t\tbreak;\n+\t\t}\n+\n+\t\tcase V4L2_CID_EXPOSURE_AUTO: {\n+\t\t\tint ivalue = value.get();\n+\t\t\tif (ivalue == V4L2_EXPOSURE_APERTURE_PRIORITY)\n+\t\t\t\tmetadata->set(controls::AeEnable, true);\n+\t\t\telse if (ivalue == V4L2_EXPOSURE_MANUAL)\n+\t\t\t\tmetadata->set(controls::AeEnable, false);\n+\t\t\tbreak;\n+\t\t}\n+\n+\t\tcase V4L2_CID_EXPOSURE_ABSOLUTE:\n+\t\t\tmetadata->set(controls::ExposureTime, value.get() * 100);\n+\t\t\tbreak;\n+\n+\t\tcase V4L2_CID_FOCUS_ABSOLUTE: {\n+\t\t\tControlInfo v4l2Info = video_->controls().at(cid);\n+\t\t\tint32_t min = v4l2Info.min().get();\n+\t\t\tint32_t max = v4l2Info.max().get();\n+\n+\t\t\tfloat focusedAt50Cm = 0.15f * (max - min);\n+\t\t\tfloat scale = 2.0f / focusedAt50Cm;\n+\n+\t\t\tmetadata->set(controls::LensPosition, (value.get() - min) * scale);\n+\t\t\tbreak;\n+\t\t}\n+\n+\t\tcase V4L2_CID_FOCUS_AUTO: {\n+\t\t\tint ivalue = value.get();\n+\t\t\tif (ivalue == V4L2_FOCUS_MANUAL)\n+\t\t\t\tmetadata->set(controls::AfMode, controls::AfModeManual);\n+\t\t\telse if (ivalue == V4L2_FOCUS_AUTO)\n+\t\t\t\tmetadata->set(controls::AfMode, controls::AfModeAuto);\n+\t\t\tbreak;\n+\t\t}\n+\n+\t\tdefault:;\n+\t\t}\n+\t}\n \n \tpipe()->completeBuffer(request, buffer);\n \tpipe()->completeRequest(request);\n","prefixes":["v2"]}