Patch Detail
Show a patch.
GET /api/1.1/patches/22956/?format=api
{ "id": 22956, "url": "https://patchwork.libcamera.org/api/1.1/patches/22956/?format=api", "web_url": "https://patchwork.libcamera.org/patch/22956/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20250314174248.1015718-2-barnabas.pocze@ideasonboard.com>", "date": "2025-03-14T17:42:45", "name": "[v3,1/4] libcamera: pipeline: uvcvideo: Fix `ExposureTimeMode` control setup", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "f4752d15e73db8a33a5666725e42c2ce03420b58", "submitter": { "id": 216, "url": "https://patchwork.libcamera.org/api/1.1/people/216/?format=api", "name": "Barnabás Pőcze", "email": "barnabas.pocze@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/22956/mbox/", "series": [ { "id": 5061, "url": "https://patchwork.libcamera.org/api/1.1/series/5061/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=5061", "date": "2025-03-14T17:42:44", "name": "libcamera: pipeline: uvcvideo: Fix `ExposureTimeMode` control", "version": 3, "mbox": "https://patchwork.libcamera.org/series/5061/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/22956/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/22956/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "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 A71FCC32F9\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 14 Mar 2025 17:42:53 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 67BEE68951;\n\tFri, 14 Mar 2025 18:42:53 +0100 (CET)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id C02A46893D\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 14 Mar 2025 18:42:51 +0100 (CET)", "from pb-laptop.local (185.221.143.221.nat.pool.zt.hu\n\t[185.221.143.221])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 6ABD8842\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 14 Mar 2025 18:41:12 +0100 (CET)" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"iUNMPEXp\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1741974072;\n\tbh=2qpqoZ3DL/NFKSUdh8Ka6YMds0Yuv/5ybzbZpYqe++0=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=iUNMPEXpGVbgQnPr9hWXIjrW+wzlmfhveAafs8xdO0ROsQ9CHG2/yxX7aXrDQtaHv\n\tN7am+izqrModjCAO42UhGRRrMJ5CMDsEn6ZWw0OkYAhOKd8p7ZVy4Lj1ZysHaA2rZb\n\tyRercF7QBVz8UJBou/X97NEoG9nlOeiA/anIrrHM=", "From": "=?utf-8?q?Barnab=C3=A1s_P=C5=91cze?= <barnabas.pocze@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Subject": "[PATCH v3 1/4] libcamera: pipeline: uvcvideo: Fix `ExposureTimeMode`\n\tcontrol setup", "Date": "Fri, 14 Mar 2025 18:42:45 +0100", "Message-ID": "<20250314174248.1015718-2-barnabas.pocze@ideasonboard.com>", "X-Mailer": "git-send-email 2.48.1", "In-Reply-To": "<20250314174248.1015718-1-barnabas.pocze@ideasonboard.com>", "References": "<20250314174248.1015718-1-barnabas.pocze@ideasonboard.com>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "`ControlInfo(Span<const int32_t>{...})` calls the incorrect constructor\nof `ControlInfo`. The intended constructor to be called is\n`ControlInfo(Span<const ControlValue>, ...)` however that is not called\nbecause a span of `const int32_t` is passed. Instead, the constructor\n`ControlInfo(const ControlValue &min, const ControlValue &max, ...)`\nwill be called.\n\nFurthermore, since `values.back()` is used, only the last element of\nthe array is actually set.\n\nTo fix this, convert the array to contain `ControlValue` objects and use\na separate variable to keep track of which element to set next.\n\nFor each of `ExposureTimeMode{Auto,Manual}` save the V4L2 control value\nthat is to be used when the libcamera control is set.\n\nFixes: bad8d591f8acfa (\"libcamera: uvcvideo: Register ExposureTimeMode control\")\nSigned-off-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>\n---\n src/libcamera/pipeline/uvcvideo/uvcvideo.cpp | 89 +++++++++++++++-----\n 1 file changed, 70 insertions(+), 19 deletions(-)", "diff": "diff --git a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\nindex dedcac89b..5c9025d9b 100644\n--- a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\n+++ b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp\n@@ -6,6 +6,7 @@\n */\n \n #include <algorithm>\n+#include <bitset>\n #include <cmath>\n #include <fstream>\n #include <map>\n@@ -58,6 +59,9 @@ public:\n \tStream stream_;\n \tstd::map<PixelFormat, std::vector<SizeRange>> formats_;\n \n+\tstd::optional<v4l2_exposure_auto_type> autoExposureMode_;\n+\tstd::optional<v4l2_exposure_auto_type> manualExposureMode_;\n+\n private:\n \tbool generateId();\n \n@@ -108,6 +112,26 @@ private:\n \t}\n };\n \n+namespace {\n+\n+std::optional<controls::ExposureTimeModeEnum> v4l2ToExposureMode(int32_t x)\n+{\n+\tusing namespace controls;\n+\n+\tswitch (x) {\n+\tcase V4L2_EXPOSURE_AUTO:\n+\tcase V4L2_EXPOSURE_APERTURE_PRIORITY:\n+\t\treturn ExposureTimeModeAuto;\n+\tcase V4L2_EXPOSURE_MANUAL:\n+\tcase V4L2_EXPOSURE_SHUTTER_PRIORITY:\n+\t\treturn ExposureTimeModeManual;\n+\tdefault:\n+\t\treturn {};\n+\t}\n+}\n+\n+} /* namespace */\n+\n UVCCameraConfiguration::UVCCameraConfiguration(UVCCameraData *data)\n \t: CameraConfiguration(), data_(data)\n {\n@@ -725,25 +749,52 @@ void UVCCameraData::addControl(uint32_t cid, const ControlInfo &v4l2Info,\n \t\t * ExposureTimeModeManual = { V4L2_EXPOSURE_MANUAL,\n \t\t *\t\t\t V4L2_EXPOSURE_SHUTTER_PRIORITY }\n \t\t */\n-\t\tstd::array<int32_t, 2> values{};\n-\n-\t\tauto it = std::find_if(v4l2Values.begin(), v4l2Values.end(),\n-\t\t\t[&](const ControlValue &val) {\n-\t\t\t\treturn (val.get<int32_t>() == V4L2_EXPOSURE_APERTURE_PRIORITY ||\n-\t\t\t\t\tval.get<int32_t>() == V4L2_EXPOSURE_AUTO) ? true : false;\n-\t\t\t});\n-\t\tif (it != v4l2Values.end())\n-\t\t\tvalues.back() = static_cast<int32_t>(controls::ExposureTimeModeAuto);\n-\n-\t\tit = std::find_if(v4l2Values.begin(), v4l2Values.end(),\n-\t\t\t[&](const ControlValue &val) {\n-\t\t\t\treturn (val.get<int32_t>() == V4L2_EXPOSURE_SHUTTER_PRIORITY ||\n-\t\t\t\t\tval.get<int32_t>() == V4L2_EXPOSURE_MANUAL) ? true : false;\n-\t\t\t});\n-\t\tif (it != v4l2Values.end())\n-\t\t\tvalues.back() = static_cast<int32_t>(controls::ExposureTimeModeManual);\n-\n-\t\tinfo = ControlInfo{Span<int32_t>{values}, values[0]};\n+\n+\t\tstd::bitset<\n+\t\t\tstd::max(V4L2_EXPOSURE_AUTO,\n+\t\t\tstd::max(V4L2_EXPOSURE_APERTURE_PRIORITY,\n+\t\t\tstd::max(V4L2_EXPOSURE_MANUAL,\n+\t\t\t\t V4L2_EXPOSURE_SHUTTER_PRIORITY))) + 1\n+\t\t> exposureModes;\n+\t\tstd::optional<controls::ExposureTimeModeEnum> lcDef;\n+\n+\t\tfor (const ControlValue &value : v4l2Values) {\n+\t\t\tconst auto x = value.get<int32_t>();\n+\n+\t\t\tif (0 <= x && static_cast<std::size_t>(x) < exposureModes.size()) {\n+\t\t\t\texposureModes[x] = true;\n+\n+\t\t\t\tif (x == def)\n+\t\t\t\t\tlcDef = v4l2ToExposureMode(x);\n+\t\t\t}\n+\t\t}\n+\n+\t\tif (exposureModes[V4L2_EXPOSURE_AUTO])\n+\t\t\tautoExposureMode_ = V4L2_EXPOSURE_AUTO;\n+\t\telse if (exposureModes[V4L2_EXPOSURE_APERTURE_PRIORITY])\n+\t\t\tautoExposureMode_ = V4L2_EXPOSURE_APERTURE_PRIORITY;\n+\n+\t\tif (exposureModes[V4L2_EXPOSURE_MANUAL])\n+\t\t\tmanualExposureMode_ = V4L2_EXPOSURE_MANUAL;\n+\t\telse if (exposureModes[V4L2_EXPOSURE_SHUTTER_PRIORITY])\n+\t\t\tmanualExposureMode_ = V4L2_EXPOSURE_SHUTTER_PRIORITY;\n+\n+\t\tstd::array<ControlValue, 2> values;\n+\t\tstd::size_t count = 0;\n+\n+\t\tif (autoExposureMode_)\n+\t\t\tvalues[count++] = controls::ExposureTimeModeAuto;\n+\n+\t\tif (manualExposureMode_)\n+\t\t\tvalues[count++] = controls::ExposureTimeModeManual;\n+\n+\t\tif (count == 0)\n+\t\t\treturn;\n+\n+\t\tinfo = ControlInfo{\n+\t\t\tSpan<const ControlValue>{ values.data(), count },\n+\t\t\t!lcDef ? values.front() : *lcDef,\n+\t\t};\n \t\tbreak;\n \t}\n \tcase V4L2_CID_EXPOSURE_ABSOLUTE:\n", "prefixes": [ "v3", "1/4" ] }