Patch Detail
Show a patch.
GET /api/1.1/patches/20080/?format=api
{ "id": 20080, "url": "https://patchwork.libcamera.org/api/1.1/patches/20080/?format=api", "web_url": "https://patchwork.libcamera.org/patch/20080/", "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": "<20240520120110.110067-2-umang.jain@ideasonboard.com>", "date": "2024-05-20T12:01:09", "name": "[1/2] apps: cam: Add option to configure sensor", "commit_ref": null, "pull_url": null, "state": "not-applicable", "archived": false, "hash": "bd12b9a4419d1af946d6a7f0fa636fa0c1b0b7c2", "submitter": { "id": 86, "url": "https://patchwork.libcamera.org/api/1.1/people/86/?format=api", "name": "Umang Jain", "email": "umang.jain@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/20080/mbox/", "series": [ { "id": 4320, "url": "https://patchwork.libcamera.org/api/1.1/series/4320/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=4320", "date": "2024-05-20T12:01:08", "name": "apps: Add option to configure sensor", "version": 1, "mbox": "https://patchwork.libcamera.org/series/4320/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/20080/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/20080/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 229B2BDE6B\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon, 20 May 2024 12:01:24 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id AAEF06347F;\n\tMon, 20 May 2024 14:01:23 +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 623AA61A58\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 20 May 2024 14:01:19 +0200 (CEST)", "from fedora.local (unknown\n\t[IPv6:2405:201:2015:f873:c173:4b:4a04:3a21])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 785CAC67;\n\tMon, 20 May 2024 14:01:07 +0200 (CEST)" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"r9W3h7Zv\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1716206468;\n\tbh=M0bUn3sLO2cAs+46gPIvIjFfXiJJRiFv6bNkrFznt1Y=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=r9W3h7ZvOAbauvL37MxkQx0HnO56xCs8OAiHlI1oZx2mp3QJRxgdFe2poo9P71Cgg\n\tdFr1D+17FeYKyeQxJySZfJqZTvq3n2QY8blIF3vNo3YXbVl/p1HpqCMYkeD2sQajh+\n\tNdUhfa+5dhtsGYL6xtTGDMTZGz3uH6NTQKhC3TwI=", "From": "Umang Jain <umang.jain@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Jacopo Mondi <jacopo.mondi@ideasonboard.com>,\n\tPaul Elder <paul.elder@ideasonboard.com>", "Subject": "[PATCH 1/2] apps: cam: Add option to configure sensor", "Date": "Mon, 20 May 2024 17:31:09 +0530", "Message-ID": "<20240520120110.110067-2-umang.jain@ideasonboard.com>", "X-Mailer": "git-send-email 2.44.0", "In-Reply-To": "<20240520120110.110067-1-umang.jain@ideasonboard.com>", "References": "<20240520120110.110067-1-umang.jain@ideasonboard.com>", "MIME-Version": "1.0", "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": "From: Jacopo Mondi <jacopo.mondi@ideasonboard.com>\n\nAdd 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>\nSigned-off-by: Paul Elder <paul.elder@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 f13355ba..a51dcfbc 100644\n--- a/src/apps/cam/camera_session.cpp\n+++ b/src/apps/cam/camera_session.cpp\n@@ -90,6 +90,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 4f87f200..0f751469 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@@ -178,6 +179,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 64e6a20e..65844ac5 100644\n--- a/src/apps/cam/main.h\n+++ b/src/apps/cam/main.h\n@@ -20,6 +20,7 @@ enum {\n \tOptOrientation = 'o',\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 99239e07..55a2d3d2 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 a93f104c..f1020d8c 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": [ "1/2" ] }