Patch Detail
Show a patch.
GET /api/patches/15994/?format=api
{ "id": 15994, "url": "https://patchwork.libcamera.org/api/patches/15994/?format=api", "web_url": "https://patchwork.libcamera.org/patch/15994/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/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": "<20220520165234.7642-4-laurent.pinchart@ideasonboard.com>", "date": "2022-05-20T16:52:34", "name": "[libcamera-devel,v2,3/3] cam: Use script parser to set controls", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "f6ae69f089a5c01cc49c05d658d09d9fd09427c8", "submitter": { "id": 2, "url": "https://patchwork.libcamera.org/api/people/2/?format=api", "name": "Laurent Pinchart", "email": "laurent.pinchart@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/15994/mbox/", "series": [ { "id": 3131, "url": "https://patchwork.libcamera.org/api/series/3131/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=3131", "date": "2022-05-20T16:52:31", "name": "cam: Add support for capture scripts", "version": 2, "mbox": "https://patchwork.libcamera.org/series/3131/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/15994/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/15994/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 C8BF7C326C\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 20 May 2022 16:52:50 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id E3B1365671;\n\tFri, 20 May 2022 18:52:48 +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 2D02A65668\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 20 May 2022 18:52:46 +0200 (CEST)", "from localhost.localdomain (unknown [45.131.31.124])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id C00556D1;\n\tFri, 20 May 2022 18:52:45 +0200 (CEST)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1653065569;\n\tbh=ma1XlaQ7qDzPbqc883R/RCy76hX2MGSNlKCM/5fGHr8=;\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:\n\tFrom;\n\tb=gZWcaHIicpJ7sn0MlVl1m8S2MY7f/jUkGfKVS84WWx7IflP6TSNyIKyQxEbTwxA94\n\tO1GwBej64Yw7r29e1HQdHMwl6rAGITkDPDBnECWqBiN5p3gcQcy1mGH/2IpahYNAUn\n\tmreelpkvjcw1plhEx6lCOUzWpa0PLlfuMe1iwMvNEz1I3GHk79bjEiJnO7PM/RYB6w\n\tNFCehvCe+RvTAIURGIJbi0KwDPjIqyR80prNMmo+vJmBzWrhhbH8r5DuliFApqch35\n\tQWSMhzyIKQ/37k9d1tKL/YQ8DMU6oAJtuRZVbkeZNaIZm7kv6IiepjUVOxcYbbQtBP\n\tc/RmqjC3SewrQ==", "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1653065566;\n\tbh=ma1XlaQ7qDzPbqc883R/RCy76hX2MGSNlKCM/5fGHr8=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=B8doWS1tgjqaqqqOZX71Dxv3GspS8KVXY4URuCQt/p6NxanzX4mnJd1+11LtMtiBM\n\tSNqiCKalVpVbt16wFBzwLyGQNrWtc944gchO3/O9MwOKxFOSpTv2RAlHdgKgKv1mp7\n\tkCjEcznV7N/4HG5NnvwEJfBj54W7S6FkRJIw5Pw8=" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"B8doWS1t\"; dkim-atps=neutral", "To": "libcamera-devel@lists.libcamera.org", "Date": "Fri, 20 May 2022 19:52:34 +0300", "Message-Id": "<20220520165234.7642-4-laurent.pinchart@ideasonboard.com>", "X-Mailer": "git-send-email 2.35.1", "In-Reply-To": "<20220520165234.7642-1-laurent.pinchart@ideasonboard.com>", "References": "<20220520165234.7642-1-laurent.pinchart@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v2 3/3] cam: Use script parser to set\n\tcontrols", "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": "Laurent Pinchart via libcamera-devel\n\t<libcamera-devel@lists.libcamera.org>", "Reply-To": "Laurent Pinchart <laurent.pinchart@ideasonboard.com>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "From: Jacopo Mondi <jacopo@jmondi.org>\n\nAdd a \"--script\" option to the cam test application to allow specify a\ncapture script to be used to drive the capture session. Add to the\nCameraSession class a script parser instance, created conditionally to\nthe OptCaptureScript option.\n\nIf the script parser has been created, use it at queueRequest time to\nretrieve the list of controls that has to be associated with a Request,\nand populate Request::controls() with it before queueing it to the\nCamera.\n\nSigned-off-by: Jacopo Mondi <jacopo@jmondi.org>\n---\nChanges since v1:\n\n- Add error message if the capture script is invalid\n- Forward-declare CaptureScript\n- Remove stray \\n in help text\n- Squash with \"cam: Add a --script option\"\n---\n src/cam/camera_session.cpp | 14 ++++++++++++++\n src/cam/camera_session.h | 3 +++\n src/cam/main.cpp | 4 ++++\n src/cam/main.h | 1 +\n 4 files changed, 22 insertions(+)", "diff": "diff --git a/src/cam/camera_session.cpp b/src/cam/camera_session.cpp\nindex 0bb95c8bf682..76d552d98917 100644\n--- a/src/cam/camera_session.cpp\n+++ b/src/cam/camera_session.cpp\n@@ -14,6 +14,7 @@\n #include <libcamera/property_ids.h>\n \n #include \"camera_session.h\"\n+#include \"capture_script.h\"\n #include \"event_loop.h\"\n #include \"file_sink.h\"\n #ifdef HAVE_KMS\n@@ -91,6 +92,16 @@ CameraSession::CameraSession(CameraManager *cm,\n \t}\n #endif\n \n+\tif (options_.isSet(OptCaptureScript)) {\n+\t\tstd::string scriptName = options_[OptCaptureScript].toString();\n+\t\tscript_ = std::make_unique<CaptureScript>(camera_, scriptName);\n+\t\tif (!script_->valid()) {\n+\t\t\tstd::cerr << \"Invalid capture script '\" << scriptName\n+\t\t\t\t << \"'\" << std::endl;\n+\t\t\treturn;\n+\t\t}\n+\t}\n+\n \tswitch (config->validate()) {\n \tcase CameraConfiguration::Valid:\n \t\tbreak;\n@@ -322,6 +333,9 @@ int CameraSession::queueRequest(Request *request)\n \tif (captureLimit_ && queueCount_ >= captureLimit_)\n \t\treturn 0;\n \n+\tif (script_)\n+\t\trequest->controls() = script_->frameControls(queueCount_);\n+\n \tqueueCount_++;\n \n \treturn camera_->queueRequest(request);\ndiff --git a/src/cam/camera_session.h b/src/cam/camera_session.h\nindex bf966bd15ab0..d562caae0794 100644\n--- a/src/cam/camera_session.h\n+++ b/src/cam/camera_session.h\n@@ -23,6 +23,7 @@\n \n #include \"options.h\"\n \n+class CaptureScript;\n class FrameSink;\n \n class CameraSession\n@@ -60,6 +61,8 @@ private:\n \tstd::shared_ptr<libcamera::Camera> camera_;\n \tstd::unique_ptr<libcamera::CameraConfiguration> config_;\n \n+\tstd::unique_ptr<CaptureScript> script_;\n+\n \tstd::map<const libcamera::Stream *, std::string> streamNames_;\n \tstd::unique_ptr<FrameSink> sink_;\n \tunsigned int cameraIndex_;\ndiff --git a/src/cam/main.cpp b/src/cam/main.cpp\nindex c7f664b903e0..9c3370d7951f 100644\n--- a/src/cam/main.cpp\n+++ b/src/cam/main.cpp\n@@ -158,6 +158,10 @@ int CamApp::parseOptions(int argc, char *argv[])\n \t\t\t \"Print the metadata for completed requests\",\n \t\t\t \"metadata\", ArgumentNone, nullptr, false,\n \t\t\t OptCamera);\n+\tparser.addOption(OptCaptureScript, OptionString,\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 \n \toptions_ = parser.parse(argc, argv);\n \tif (!options_.valid())\ndiff --git a/src/cam/main.h b/src/cam/main.h\nindex 62f7bbc9d181..51b87927837f 100644\n--- a/src/cam/main.h\n+++ b/src/cam/main.h\n@@ -21,4 +21,5 @@ enum {\n \tOptListControls = 256,\n \tOptStrictFormats = 257,\n \tOptMetadata = 258,\n+\tOptCaptureScript = 259,\n };\n", "prefixes": [ "libcamera-devel", "v2", "3/3" ] }