Patch Detail
Show a patch.
GET /api/1.1/patches/19077/?format=api
{ "id": 19077, "url": "https://patchwork.libcamera.org/api/1.1/patches/19077/?format=api", "web_url": "https://patchwork.libcamera.org/patch/19077/", "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": "<20230921165550.50956-14-jacopo.mondi@ideasonboard.com>", "date": "2023-09-21T16:55:50", "name": "[libcamera-devel,v5,13/13] apps: cam: Add option to configure sensor", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "33f07200dbe4527f9a7722f564bf4840afbec4ed", "submitter": { "id": 143, "url": "https://patchwork.libcamera.org/api/1.1/people/143/?format=api", "name": "Jacopo Mondi", "email": "jacopo.mondi@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/19077/mbox/", "series": [ { "id": 4034, "url": "https://patchwork.libcamera.org/api/1.1/series/4034/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=4034", "date": "2023-09-21T16:55:37", "name": "libcamera: Introduce SensorConfiguration", "version": 5, "mbox": "https://patchwork.libcamera.org/series/4034/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/19077/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/19077/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 C2F80C32B0\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu, 21 Sep 2023 16:56:15 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 7DA6C62963;\n\tThu, 21 Sep 2023 18:56:15 +0200 (CEST)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id B94D162948\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 21 Sep 2023 18:56:06 +0200 (CEST)", "from uno.lan (93-46-82-201.ip106.fastwebnet.it [93.46.82.201])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 0865E1102;\n\tThu, 21 Sep 2023 18:54:28 +0200 (CEST)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1695315375;\n\tbh=LOO4pFx1IRYfHHjHm+nfzSRXK168AXtwhSnNX5UrCIY=;\n\th=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc:\n\tFrom;\n\tb=FegbitA24tyk+46IhVmfreVWwQ7MGv5l+yAXT/862Ms5hT2KFj2I9VSMF7kyENWpK\n\tF5Xv74eC9aX0WEjgxdQseLUylbVcmcRqc9VVpa66uo99j5hQpUJ/aCWNQ7Wf1Ynort\n\tZ/QuPofC5eGpN7qqA7oE+mXVT6wvJ1AArkubpXeWWNLlvLGiuNNuQJFmeE8I8OqI3B\n\tjAhcXc07gvWrzc8KZFywUyxeuXhTQkPVV3JijL9deKVgsyOMLzTD5+wubQRw1i18SV\n\tTIBY0nOYcbi5UdGMenETFKWCv1ICnSUQ/ifMDIkowJXzqEFJtHGE5N4Xg4kLTv+TeE\n\tAvWD7DPGOZVCw==", "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1695315269;\n\tbh=LOO4pFx1IRYfHHjHm+nfzSRXK168AXtwhSnNX5UrCIY=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=KS3DEZPr/xmrMZueQE5QQIlBIO/nT+Hf12bM+QH1oUGMATNJbb6cZl1wvJdOdN6Mb\n\tb2j2bhGCCQjPnxsbwDdJqrwUNO8dKpWQ9P0c31v6gG9SPIkJ4VtSag/wgleKe562TS\n\tXQETTqXOP1x45guGZRV1rsFE9zw5pi6f5QPbSmco=" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"KS3DEZPr\"; dkim-atps=neutral", "To": "libcamera-devel@lists.libcamera.org", "Date": "Thu, 21 Sep 2023 18:55:50 +0200", "Message-ID": "<20230921165550.50956-14-jacopo.mondi@ideasonboard.com>", "X-Mailer": "git-send-email 2.42.0", "In-Reply-To": "<20230921165550.50956-1-jacopo.mondi@ideasonboard.com>", "References": "<20230921165550.50956-1-jacopo.mondi@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v5 13/13] apps: cam: Add option to\n\tconfigure sensor", "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>", "From": "Jacopo Mondi via libcamera-devel <libcamera-devel@lists.libcamera.org>", "Reply-To": "Jacopo Mondi <jacopo.mondi@ideasonboard.com>", "Cc": "Jacopo Mondi <jacopo.mondi@ideasonboard.com>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Add a '-f|--sensor_format' option to cam to allow forcing a sensor\nconfiguration from the command line.\n\nAs an example:\ncam -c1 -C -S --stream pixelformat=YUYV -f width=3840,height=2160,bitDepth=10\n\nSigned-off-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>\n---\n src/apps/cam/camera_session.cpp | 7 +++++\n src/apps/cam/main.cpp | 4 +++\n src/apps/cam/main.h | 1 +\n src/apps/common/stream_options.cpp | 42 ++++++++++++++++++++++++++++++\n src/apps/common/stream_options.h | 8 ++++++\n 5 files changed, 62 insertions(+)", "diff": "diff --git a/src/apps/cam/camera_session.cpp b/src/apps/cam/camera_session.cpp\nindex 066e397b5f47..4e01ebdc3e90 100644\n--- a/src/apps/cam/camera_session.cpp\n+++ b/src/apps/cam/camera_session.cpp\n@@ -72,6 +72,13 @@ CameraSession::CameraSession(CameraManager *cm,\n \t\treturn;\n \t}\n \n+\t/* Apply a sensor configuration is requested. */\n+\tif (SensorKeyValueParser::updateConfiguration(config.get(),\n+\t\t\t\t\t\t options_[OptSensorFmt])) {\n+\t\tstd::cerr << \"Failed to apply sensor configuration\" << std::endl;\n+\t\treturn;\n+\t}\n+\n \tbool strictFormats = options_.isSet(OptStrictFormats);\n \n #ifdef HAVE_KMS\ndiff --git a/src/apps/cam/main.cpp b/src/apps/cam/main.cpp\nindex 5d8a57bc14e5..d15ee875d6b8 100644\n--- a/src/apps/cam/main.cpp\n+++ b/src/apps/cam/main.cpp\n@@ -110,6 +110,7 @@ void CamApp::quit()\n int CamApp::parseOptions(int argc, char *argv[])\n {\n \tStreamKeyValueParser streamKeyValue;\n+\tSensorKeyValueParser sensorKeyValue;\n \n \tOptionsParser parser;\n \tparser.addOption(OptCamera, OptionString,\n@@ -171,6 +172,9 @@ int CamApp::parseOptions(int argc, char *argv[])\n \t\t\t \"Load a capture session configuration script from a file\",\n \t\t\t \"script\", ArgumentRequired, \"script\", false,\n \t\t\t OptCamera);\n+\tparser.addOption(OptSensorFmt, &sensorKeyValue,\n+\t\t\t \"Apply a format to the sensor\", \"sensor_format\", true,\n+\t\t\t OptCamera);\n \n \toptions_ = parser.parse(argc, argv);\n \tif (!options_.valid())\ndiff --git a/src/apps/cam/main.h b/src/apps/cam/main.h\nindex 526aecece3f3..1432cfeb5052 100644\n--- a/src/apps/cam/main.h\n+++ b/src/apps/cam/main.h\n@@ -19,6 +19,7 @@ enum {\n \tOptMonitor = 'm',\n \tOptSDL = 'S',\n \tOptStream = 's',\n+\tOptSensorFmt = 'f',\n \tOptListControls = 256,\n \tOptStrictFormats = 257,\n \tOptMetadata = 258,\ndiff --git a/src/apps/common/stream_options.cpp b/src/apps/common/stream_options.cpp\nindex 663b979aa763..a61317ab7fad 100644\n--- a/src/apps/common/stream_options.cpp\n+++ b/src/apps/common/stream_options.cpp\n@@ -119,3 +119,45 @@ std::optional<libcamera::StreamRole> StreamKeyValueParser::parseRole(const KeyVa\n \n \treturn {};\n }\n+\n+SensorKeyValueParser::SensorKeyValueParser()\n+{\n+\taddOption(\"bitDepth\", OptionInteger, \"Sensor format bit depth\",\n+\t\t ArgumentRequired);\n+\taddOption(\"width\", OptionInteger, \"Sensor frame width in pixels\",\n+\t\t ArgumentRequired);\n+\taddOption(\"height\", OptionInteger, \"Sensor frame height in pixels\",\n+\t\t ArgumentRequired);\n+}\n+\n+int SensorKeyValueParser::updateConfiguration(CameraConfiguration *config,\n+\t\t\t\t\t const OptionValue &values)\n+{\n+\tif (!config) {\n+\t\tstd::cerr << \"No configuration provided\" << std::endl;\n+\t\treturn -EINVAL;\n+\t}\n+\n+\t/* If no configuration values nothing to do. */\n+\tif (values.empty())\n+\t\treturn 0;\n+\n+\tconst std::vector<OptionValue> &streamParameters = values.toArray();\n+\tSensorConfiguration sensorConfig;\n+\n+\tfor (auto const &value : streamParameters) {\n+\t\tKeyValueParser::Options opts = value.toKeyValues();\n+\n+\t\tif (opts.isSet(\"width\") && opts.isSet(\"height\")) {\n+\t\t\tsensorConfig.outputSize.width = opts[\"width\"];\n+\t\t\tsensorConfig.outputSize.height = opts[\"height\"];\n+\t\t}\n+\n+\t\tif (opts.isSet(\"bitDepth\"))\n+\t\t\tsensorConfig.bitDepth = opts[\"bitDepth\"];\n+\t}\n+\n+\tconfig->sensorConfig = sensorConfig;\n+\n+\treturn 0;\n+}\ndiff --git a/src/apps/common/stream_options.h b/src/apps/common/stream_options.h\nindex a5f3bde08da8..a338206bd005 100644\n--- a/src/apps/common/stream_options.h\n+++ b/src/apps/common/stream_options.h\n@@ -27,3 +27,11 @@ public:\n private:\n \tstatic std::optional<libcamera::StreamRole> parseRole(const KeyValueParser::Options &options);\n };\n+\n+class SensorKeyValueParser : public KeyValueParser\n+{\n+public:\n+\tSensorKeyValueParser();\n+\tstatic int updateConfiguration(libcamera::CameraConfiguration *config,\n+\t\t\t\t const OptionValue &values);\n+};\n", "prefixes": [ "libcamera-devel", "v5", "13/13" ] }