Patch Detail
Show a patch.
GET /api/patches/24509/?format=api
{ "id": 24509, "url": "https://patchwork.libcamera.org/api/patches/24509/?format=api", "web_url": "https://patchwork.libcamera.org/patch/24509/", "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": "<20250930122726.1837524-11-stefan.klug@ideasonboard.com>", "date": "2025-09-30T12:26:31", "name": "[v1,10/33] pipeline: rkisp1: Use V4L2 requests for the dewarper", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "42085e7f37c00329b0f84621df0b9dfd32297b35", "submitter": { "id": 184, "url": "https://patchwork.libcamera.org/api/people/184/?format=api", "name": "Stefan Klug", "email": "stefan.klug@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/24509/mbox/", "series": [ { "id": 5468, "url": "https://patchwork.libcamera.org/api/series/5468/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=5468", "date": "2025-09-30T12:26:21", "name": "Full dewarper support on imx8mp", "version": 1, "mbox": "https://patchwork.libcamera.org/series/5468/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/24509/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/24509/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 9434AC328C\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 30 Sep 2025 12:52:38 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 9CE0B6B5F0;\n\tTue, 30 Sep 2025 14:52:37 +0200 (CEST)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 4FCDB62C35\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 30 Sep 2025 14:52:36 +0200 (CEST)", "from ideasonboard.com (unknown [94.31.94.171])\n\tby perceval.ideasonboard.com (Postfix) with UTF8SMTPSA id ED0B6220;\n\tTue, 30 Sep 2025 14:51: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=\"flBRP9i+\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1759236668;\n\tbh=SifEoJuCAlwRZWF+a4Ee1W4HI0QpOWoD9aAvLu2E1Qg=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=flBRP9i+yz5OunatV7gg1Zd5XI6lhUsAgkenSeCZRu8Bd8xS0nACprnDKbCJj0ft3\n\tvlpOs85iHkxPbLvHhyVRHVp9kBdIKUdSns77RuhrrlRed/J3kVL1ysvckMRd/3MPXj\n\twsXSZd9ynGYY0i6KQYn0pXt/LQo8nE2jlFOSc4fU=", "From": "Stefan Klug <stefan.klug@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Cc": "Stefan Klug <stefan.klug@ideasonboard.com>", "Subject": "[PATCH v1 10/33] pipeline: rkisp1: Use V4L2 requests for the\n\tdewarper", "Date": "Tue, 30 Sep 2025 14:26:31 +0200", "Message-ID": "<20250930122726.1837524-11-stefan.klug@ideasonboard.com>", "X-Mailer": "git-send-email 2.48.1", "In-Reply-To": "<20250930122726.1837524-1-stefan.klug@ideasonboard.com>", "References": "<20250930122726.1837524-1-stefan.klug@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": "Use the V4L2 requests API if the dewarper supports it.\n\nSigned-off-by: Stefan Klug <stefan.klug@ideasonboard.com>\n---\n src/libcamera/pipeline/rkisp1/rkisp1.cpp | 61 ++++++++++++++++++++++--\n 1 file changed, 57 insertions(+), 4 deletions(-)", "diff": "diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\nindex b52d1ff736cd..6048f028000a 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n@@ -44,6 +44,7 @@\n #include \"libcamera/internal/media_device.h\"\n #include \"libcamera/internal/media_pipeline.h\"\n #include \"libcamera/internal/pipeline_handler.h\"\n+#include \"libcamera/internal/v4l2_request.h\"\n #include \"libcamera/internal/v4l2_subdevice.h\"\n #include \"libcamera/internal/v4l2_videodevice.h\"\n \n@@ -210,6 +211,7 @@ private:\n \tvoid imageBufferReady(FrameBuffer *buffer);\n \tvoid paramBufferReady(FrameBuffer *buffer);\n \tvoid statBufferReady(FrameBuffer *buffer);\n+\tvoid dewarpRequestReady(V4L2Request *request);\n \tvoid dewarpBufferReady(FrameBuffer *buffer);\n \tvoid frameStart(uint32_t sequence);\n \n@@ -239,6 +241,9 @@ private:\n \tstd::vector<std::unique_ptr<FrameBuffer>> mainPathBuffers_;\n \tstd::queue<FrameBuffer *> availableMainPathBuffers_;\n \n+\tstd::vector<std::unique_ptr<V4L2Request>> dewarpRequests_;\n+\tstd::queue<V4L2Request *> availableDewarpRequests_;\n+\n \tstd::vector<std::unique_ptr<FrameBuffer>> paramBuffers_;\n \tstd::vector<std::unique_ptr<FrameBuffer>> statBuffers_;\n \tstd::queue<FrameBuffer *> availableParamBuffers_;\n@@ -1034,6 +1039,18 @@ int PipelineHandlerRkISP1::allocateBuffers(Camera *camera)\n \n \t\tfor (std::unique_ptr<FrameBuffer> &buffer : mainPathBuffers_)\n \t\t\tavailableMainPathBuffers_.push(buffer.get());\n+\n+\t\tif (dewarper_->supportsRequests()) {\n+\t\t\tret = dewarper_->allocateRequests(kRkISP1MinBufferCount,\n+\t\t\t\t\t\t\t &dewarpRequests_);\n+\t\t\tif (ret < 0)\n+\t\t\t\tLOG(RkISP1, Error) << \"Failed to allocate requests.\";\n+\t\t}\n+\n+\t\tfor (std::unique_ptr<V4L2Request> &request : dewarpRequests_) {\n+\t\t\trequest->requestDone.connect(this, &PipelineHandlerRkISP1::dewarpRequestReady);\n+\t\t\tavailableDewarpRequests_.push(request.get());\n+\t\t}\n \t}\n \n \tauto pushBuffers = [&](const std::vector<std::unique_ptr<FrameBuffer>> &buffers,\n@@ -1075,6 +1092,11 @@ int PipelineHandlerRkISP1::freeBuffers(Camera *camera)\n \tstatBuffers_.clear();\n \tmainPathBuffers_.clear();\n \n+\twhile (!availableDewarpRequests_.empty())\n+\t\tavailableDewarpRequests_.pop();\n+\n+\tdewarpRequests_.clear();\n+\n \tstd::vector<unsigned int> ids;\n \tfor (IPABuffer &ipabuf : data->ipaBuffers_)\n \t\tids.push_back(ipabuf.id);\n@@ -1565,6 +1587,14 @@ void PipelineHandlerRkISP1::imageBufferReady(FrameBuffer *buffer)\n \t\treturn;\n \t}\n \n+\tV4L2Request *dewarpRequest = nullptr;\n+\tif (!dewarpRequests_.empty()) {\n+\t\t/* If we have requests support, there must be one available */\n+\t\tASSERT(!availableDewarpRequests_.empty());\n+\t\tdewarpRequest = availableDewarpRequests_.front();\n+\t\tavailableDewarpRequests_.pop();\n+\t}\n+\n \t/* Handle scaler crop control. */\n \tconst auto &crop = request->controls().get(controls::ScalerCrop);\n \tif (crop) {\n@@ -1602,14 +1632,37 @@ void PipelineHandlerRkISP1::imageBufferReady(FrameBuffer *buffer)\n \t * buffers for the dewarper are the buffers of the request, supplied\n \t * by the application.\n \t */\n-\tint ret = dewarper_->queueBuffers(buffer, request->buffers());\n-\tif (ret < 0)\n-\t\tLOG(RkISP1, Error) << \"Cannot queue buffers to dewarper: \"\n-\t\t\t\t << strerror(-ret);\n+\tint ret = dewarper_->queueBuffers(buffer, request->buffers(), dewarpRequest);\n+\tif (ret < 0) {\n+\t\tLOG(RkISP1, Error) << \"Failed to queue buffers to dewarper: -\"\n+\t\t\t\t << strerrorname_np(-ret);\n+\n+\t\t/* Push it back into the queue. */\n+\t\tif (dewarpRequest)\n+\t\t\tdewarpRequestReady(dewarpRequest);\n+\n+\t\treturn;\n+\t}\n+\n+\tif (dewarpRequest) {\n+\t\tret = dewarpRequest->queue();\n+\t\tif (ret < 0) {\n+\t\t\tLOG(RkISP1, Error) << \"Failed to queue dewarp request: -\"\n+\t\t\t\t\t << strerrorname_np(-ret);\n+\t\t\t/* Push it back into the queue. */\n+\t\t\tdewarpRequestReady(dewarpRequest);\n+\t\t}\n+\t}\n \n \trequest->metadata().set(controls::ScalerCrop, activeCrop_.value());\n }\n \n+void PipelineHandlerRkISP1::dewarpRequestReady(V4L2Request *request)\n+{\n+\trequest->reinit();\n+\tavailableDewarpRequests_.push(request);\n+}\n+\n void PipelineHandlerRkISP1::dewarpBufferReady(FrameBuffer *buffer)\n {\n \tASSERT(activeCamera_);\n", "prefixes": [ "v1", "10/33" ] }