{"id":24737,"url":"https://patchwork.libcamera.org/api/patches/24737/?format=json","web_url":"https://patchwork.libcamera.org/patch/24737/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20251023144841.403689-10-stefan.klug@ideasonboard.com>","date":"2025-10-23T14:48:10","name":"[v2,09/35] pipeline: rkisp1: Use V4L2 requests for the dewarper","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"258dfce98ae00c095f2ccd2bf330ef6446af48b4","submitter":{"id":184,"url":"https://patchwork.libcamera.org/api/people/184/?format=json","name":"Stefan Klug","email":"stefan.klug@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/24737/mbox/","series":[{"id":5520,"url":"https://patchwork.libcamera.org/api/series/5520/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=5520","date":"2025-10-23T14:48:01","name":"Full dewarper support on imx8mp","version":2,"mbox":"https://patchwork.libcamera.org/series/5520/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/24737/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/24737/checks/","tags":{},"headers":{"Return-Path":"","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 E86C3C32CE\n\tfor ;\n\tThu, 23 Oct 2025 14:49:14 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 90B3B607FF;\n\tThu, 23 Oct 2025 16:49:14 +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 4110D607F3\n\tfor ;\n\tThu, 23 Oct 2025 16:49:13 +0200 (CEST)","from ideasonboard.com (unknown\n\t[IPv6:2a00:6020:448c:6c00:7328:357b:4ce1:72b6])\n\tby perceval.ideasonboard.com (Postfix) with UTF8SMTPSA id 52FFA1D2B; \n\tThu, 23 Oct 2025 16:47:28 +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=\"KcEQqh4p\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1761230848;\n\tbh=D4qT+SNg9hd+BYvSKgmM0erFPZxmbrAtSDyfQm6udVw=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=KcEQqh4pkTnZbFsA560AglxRhQgpyuJ1UKltR1Y0IkmZxTm7jihvNeYx7bhN103PR\n\t/UWW1DXSRMV6wNnH8TUPB6v1Cr3LrrHF/STBQmbrR5Zf7mHYQySGqr3Z36tLCXmJr+\n\tvsEm15+s3AVaOXNREVC442LVukBtXxwJDIxu40rQ=","From":"Stefan Klug ","To":"libcamera-devel@lists.libcamera.org","Cc":"Stefan Klug ","Subject":"[PATCH v2 09/35] pipeline: rkisp1: Use V4L2 requests for the\n\tdewarper","Date":"Thu, 23 Oct 2025 16:48:10 +0200","Message-ID":"<20251023144841.403689-10-stefan.klug@ideasonboard.com>","X-Mailer":"git-send-email 2.48.1","In-Reply-To":"<20251023144841.403689-1-stefan.klug@ideasonboard.com>","References":"<20251023144841.403689-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":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Use the V4L2 requests API if the dewarper supports it.\n\nSigned-off-by: Stefan Klug \n\n---\n\nChanges in v2:\n- Replace strerrorname_np() by strerror() because the former is not\n supported on all our targets\n---\n src/libcamera/pipeline/rkisp1/rkisp1.cpp | 59 ++++++++++++++++++++++--\n 1 file changed, 56 insertions(+), 3 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\nindex 0e2a210e1e80..dd3907e2fb5f 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> mainPathBuffers_;\n \tstd::queue availableMainPathBuffers_;\n \n+\tstd::vector> dewarpRequests_;\n+\tstd::queue availableDewarpRequests_;\n+\n \tstd::vector> paramBuffers_;\n \tstd::vector> statBuffers_;\n \tstd::queue availableParamBuffers_;\n@@ -1034,6 +1039,18 @@ int PipelineHandlerRkISP1::allocateBuffers(Camera *camera)\n \n \t\tfor (std::unique_ptr &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 &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> &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 ids;\n \tfor (IPABuffer &ipabuf : data->ipaBuffers_)\n \t\tids.push_back(ipabuf.id);\n@@ -1560,6 +1582,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@@ -1597,14 +1627,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+\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 << strerror(-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 << strerror(-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":["v2","09/35"]}