Patch Detail
Show a patch.
GET /api/1.1/patches/20404/?format=api
{ "id": 20404, "url": "https://patchwork.libcamera.org/api/1.1/patches/20404/?format=api", "web_url": "https://patchwork.libcamera.org/patch/20404/", "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": "<20240626072100.55497-13-mzamazal@redhat.com>", "date": "2024-06-26T07:20:53", "name": "[12/19] libcamera: software_isp: Call Algorithm::queueRequest", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "a22f0f53370be4e391f4c5e7a837c109c3d93d53", "submitter": { "id": 177, "url": "https://patchwork.libcamera.org/api/1.1/people/177/?format=api", "name": "Milan Zamazal", "email": "mzamazal@redhat.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/20404/mbox/", "series": [ { "id": 4419, "url": "https://patchwork.libcamera.org/api/1.1/series/4419/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=4419", "date": "2024-06-26T07:20:41", "name": "Software ISP refactoring", "version": 1, "mbox": "https://patchwork.libcamera.org/series/4419/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/20404/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/20404/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 2131DBD87C\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 26 Jun 2024 07:21:46 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id D39E2654BB;\n\tWed, 26 Jun 2024 09:21:45 +0200 (CEST)", "from us-smtp-delivery-124.mimecast.com\n\t(us-smtp-delivery-124.mimecast.com [170.10.133.124])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 7C9C4654B0\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 26 Jun 2024 09:21:39 +0200 (CEST)", "from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com\n\t(ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63])\n\tby relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3,\n\tcipher=TLS_AES_256_GCM_SHA384) id us-mta-130-Xuvf5Fb7ObiaY3Y3Jy7iOQ-1;\n\tWed, 26 Jun 2024 03:21:36 -0400", "from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com\n\t(mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\tkey-exchange X25519 server-signature RSA-PSS (2048 bits)\n\tserver-digest SHA256) (No client certificate requested)\n\tby mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTPS\n\tid 1099F19560AA for <libcamera-devel@lists.libcamera.org>;\n\tWed, 26 Jun 2024 07:21:36 +0000 (UTC)", "from nuthatch.brq.redhat.com (unknown [10.43.17.159])\n\tby mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix)\n\twith ESMTP id 181C73000221; Wed, 26 Jun 2024 07:21:34 +0000 (UTC)" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=redhat.com header.i=@redhat.com\n\theader.b=\"QwgfGySH\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n\ts=mimecast20190719; t=1719386498;\n\th=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n\tto:to:cc:cc:mime-version:mime-version:content-type:content-type:\n\tcontent-transfer-encoding:content-transfer-encoding:\n\tin-reply-to:in-reply-to:references:references;\n\tbh=lAdFWGmfnZVRoq0HAfOS2raUybD5jz4pjzhshDXSwNs=;\n\tb=QwgfGySH1CSGFbS8igLTlqyio4uaexZnMpXac03210AX4Ci5wiXyioWdYLWV19zuS4XbB9\n\tSLtd5hAUKycsse26U/hLxwexxfLrU6NxQeLqc1Rg1YdvYtCFjCplj1UmEuHdm4TcAlMyTr\n\tDxV8/FbQ0johCd85gtOANjkte7YHVH0=", "X-MC-Unique": "Xuvf5Fb7ObiaY3Y3Jy7iOQ-1", "From": "Milan Zamazal <mzamazal@redhat.com>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Milan Zamazal <mzamazal@redhat.com>", "Subject": "[PATCH 12/19] libcamera: software_isp: Call Algorithm::queueRequest", "Date": "Wed, 26 Jun 2024 09:20:53 +0200", "Message-ID": "<20240626072100.55497-13-mzamazal@redhat.com>", "In-Reply-To": "<20240626072100.55497-1-mzamazal@redhat.com>", "References": "<20240626072100.55497-1-mzamazal@redhat.com>", "MIME-Version": "1.0", "X-Scanned-By": "MIMEDefang 3.4.1 on 10.30.177.4", "X-Mimecast-Spam-Score": "0", "X-Mimecast-Originator": "redhat.com", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain; charset=\"US-ASCII\"; x-default=true", "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": "This patch adds Algorithm::queueRequest call for the defined algorithms.\nThis is preparation only since there are currently no Algorithm based\nalgorithms defined.\n\nSigned-off-by: Milan Zamazal <mzamazal@redhat.com>\n---\n include/libcamera/internal/software_isp/software_isp.h | 1 +\n include/libcamera/ipa/soft.mojom | 1 +\n src/ipa/simple/soft_simple.cpp | 10 ++++++++++\n src/libcamera/pipeline/simple/simple.cpp | 2 ++\n src/libcamera/software_isp/software_isp.cpp | 10 ++++++++++\n 5 files changed, 24 insertions(+)", "diff": "diff --git a/include/libcamera/internal/software_isp/software_isp.h b/include/libcamera/internal/software_isp/software_isp.h\nindex 7365b49a..8753c2fd 100644\n--- a/include/libcamera/internal/software_isp/software_isp.h\n+++ b/include/libcamera/internal/software_isp/software_isp.h\n@@ -72,6 +72,7 @@ public:\n \tint start();\n \tvoid stop();\n \n+\tvoid queueRequest(const uint32_t frame, const ControlList &controls);\n \tint queueBuffers(uint32_t frame, FrameBuffer *input,\n \t\t\t const std::map<unsigned int, FrameBuffer *> &outputs);\n \ndiff --git a/include/libcamera/ipa/soft.mojom b/include/libcamera/ipa/soft.mojom\nindex 4975b251..dad352ba 100644\n--- a/include/libcamera/ipa/soft.mojom\n+++ b/include/libcamera/ipa/soft.mojom\n@@ -20,6 +20,7 @@ interface IPASoftInterface {\n \t\t=> (int32 ret);\n \n prepare(uint32 frame);\n+ queueRequest(uint32 frame, libcamera.ControlList sensorControls);\n \t[async] processStats(uint32 frame, uint32 bufferId, libcamera.ControlList sensorControls);\n };\n \ndiff --git a/src/ipa/simple/soft_simple.cpp b/src/ipa/simple/soft_simple.cpp\nindex 9387508e..514a9db5 100644\n--- a/src/ipa/simple/soft_simple.cpp\n+++ b/src/ipa/simple/soft_simple.cpp\n@@ -78,6 +78,7 @@ public:\n \tint start() override;\n \tvoid stop() override;\n \n+\tvoid queueRequest(const uint32_t frame, const ControlList &controls) override;\n \tvoid prepare(const uint32_t frame) override;\n \tvoid processStats(const uint32_t frame, const uint32_t bufferId,\n \t\t\t const ControlList &sensorControls) override;\n@@ -272,6 +273,15 @@ void IPASoftSimple::prepare(const uint32_t frame)\n \t\talgo->prepare(context_, frame, frameContext, params_);\n }\n \n+void IPASoftSimple::queueRequest(const uint32_t frame, const ControlList &controls)\n+{\n+\tIPAFrameContext &frameContext = context_.frameContexts.alloc(frame);\n+\n+\tfor (auto const &algo : algorithms()) {\n+\t\talgo->queueRequest(context_, frame, frameContext, controls);\n+\t}\n+}\n+\n void IPASoftSimple::processStats(\n \tconst uint32_t frame,\n \t[[maybe_unused]] const uint32_t bufferId,\ndiff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp\nindex 5cca94c3..0fa9db38 100644\n--- a/src/libcamera/pipeline/simple/simple.cpp\n+++ b/src/libcamera/pipeline/simple/simple.cpp\n@@ -1421,6 +1421,8 @@ int SimplePipelineHandler::queueRequestDevice(Camera *camera, Request *request)\n \tif (data->useConversion_)\n \t\tdata->conversionQueue_.push(std::move(buffers));\n \n+\tdata->swIsp_->queueRequest(request->sequence(), request->controls());\n+\n \treturn 0;\n }\n \ndiff --git a/src/libcamera/software_isp/software_isp.cpp b/src/libcamera/software_isp/software_isp.cpp\nindex 812bc910..ba3f1bae 100644\n--- a/src/libcamera/software_isp/software_isp.cpp\n+++ b/src/libcamera/software_isp/software_isp.cpp\n@@ -277,6 +277,16 @@ int SoftwareIsp::exportBuffers(unsigned int output, unsigned int count,\n \treturn count;\n }\n \n+/**\n+ * \\brief Queue a request and process the control list from the application\n+ * \\param[in] frame The number of the frame which will be processed next\n+ * \\param[in] controls The controls for the \\a frame\n+ */\n+void SoftwareIsp::queueRequest(const uint32_t frame, const ControlList &controls)\n+{\n+\tipa_->queueRequest(frame, controls);\n+}\n+\n /**\n * \\brief Queue buffers to Software ISP\n * \\param[in] frame The frame number\n", "prefixes": [ "12/19" ] }