{"id":24748,"url":"https://patchwork.libcamera.org/api/1.1/patches/24748/?format=json","web_url":"https://patchwork.libcamera.org/patch/24748/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/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-22-stefan.klug@ideasonboard.com>","date":"2025-10-23T14:48:22","name":"[v2,21/35] libcamera: converter_dw100: Use vertex map","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"a28a96a931678f386c16bbd6c5cf1ca81a8e2db2","submitter":{"id":184,"url":"https://patchwork.libcamera.org/api/1.1/people/184/?format=json","name":"Stefan Klug","email":"stefan.klug@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/24748/mbox/","series":[{"id":5520,"url":"https://patchwork.libcamera.org/api/1.1/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/24748/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/24748/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 36CB2C333E\n\tfor ;\n\tThu, 23 Oct 2025 14:49:51 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 9EA4B6083E;\n\tThu, 23 Oct 2025 16:49:50 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id BA4116081B\n\tfor ;\n\tThu, 23 Oct 2025 16:49:49 +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 C795CEFE;\n\tThu, 23 Oct 2025 16:48:04 +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=\"hW2jcGXj\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1761230884;\n\tbh=zMPONoLmMpfnqpDZLSi9vEhOn9O6IhoX/4F6zyJ6XB4=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=hW2jcGXjNJhyrMljDGOkxg3sNheakHeq4Mkxae8ti9yyZrwK1fh4ICrIqt8ttqIxb\n\tnd5FDIfrPftlDOWreqF1DOqrhRXYpAatJS1B/E43CvrIzF0XghG3JKOx8FPRImkXct\n\tB3Gmz8OqGXo6bQaqyNky3QePizhxvCrFIyRiqFtg=","From":"Stefan Klug ","To":"libcamera-devel@lists.libcamera.org","Cc":"Stefan Klug ","Subject":"[PATCH v2 21/35] libcamera: converter_dw100: Use vertex map","Date":"Thu, 23 Oct 2025 16:48:22 +0200","Message-ID":"<20251023144841.403689-22-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 new vertexmap class in the dw100 dewarper implementation.\n\nAs the dw100 kernel driver does not use the requests API, controls can\nnot be tied to a buffer. In the case that the dewarper has buffers\nqueued for which processing has not yet started, applying the dewarp map\nwould apply to an already queued buffer. Warn when this situation\noccurs.\n\nSigned-off-by: Stefan Klug \n\n---\n\nChanges in v2:\n- Added documentation\n\nChanges in v0.9:\n- Include requests support\n\nChanges in v0.8:\n- Added warning when queue is not empty\n---\n .../internal/converter/converter_dw100.h | 19 +++++\n .../internal/converter/converter_v4l2_m2m.h | 4 +-\n src/libcamera/converter/converter_dw100.cpp | 74 +++++++++++++++++++\n 3 files changed, 95 insertions(+), 2 deletions(-)","diff":"diff --git a/include/libcamera/internal/converter/converter_dw100.h b/include/libcamera/internal/converter/converter_dw100.h\nindex dc41f365b5c7..54bc7de4de77 100644\n--- a/include/libcamera/internal/converter/converter_dw100.h\n+++ b/include/libcamera/internal/converter/converter_dw100.h\n@@ -7,6 +7,7 @@\n \n #pragma once\n \n+#include \"libcamera/internal/converter/converter_dw100_vertexmap.h\"\n #include \"libcamera/internal/converter/converter_v4l2_m2m.h\"\n \n namespace libcamera {\n@@ -19,6 +20,24 @@ class ConverterDW100 : public V4L2M2MConverter\n {\n public:\n \tConverterDW100(std::shared_ptr media);\n+\n+\tint applyVertexMap(const Stream *stream, const V4L2Request *request = nullptr);\n+\tDw100VertexMap &vertexMap(const Stream *stream);\n+\n+private:\n+\tstd::unique_ptr makeStream(const Stream *stream) override;\n+\tclass DW100Stream : public V4L2M2MConverter::V4L2M2MStream\n+\t{\n+\tpublic:\n+\t\tDW100Stream(V4L2M2MConverter *converter, const Stream *stream);\n+\n+\t\tint configure(const StreamConfiguration &inputCfg,\n+\t\t\t const StreamConfiguration &outputCfg) override;\n+\n+\t\tint applyVertexMap(const V4L2Request *request = nullptr);\n+\n+\t\tDw100VertexMap vertexMap_;\n+\t};\n };\n \n } /* namespace libcamera */\ndiff --git a/include/libcamera/internal/converter/converter_v4l2_m2m.h b/include/libcamera/internal/converter/converter_v4l2_m2m.h\nindex 79d008fc6918..03b6670daf22 100644\n--- a/include/libcamera/internal/converter/converter_v4l2_m2m.h\n+++ b/include/libcamera/internal/converter/converter_v4l2_m2m.h\n@@ -89,8 +89,8 @@ protected:\n \n \t\tbool isValid() const { return m2m_ != nullptr; }\n \n-\t\tint configure(const StreamConfiguration &inputCfg,\n-\t\t\t const StreamConfiguration &outputCfg);\n+\t\tvirtual int configure(const StreamConfiguration &inputCfg,\n+\t\t\t\t const StreamConfiguration &outputCfg);\n \t\tint exportBuffers(unsigned int count,\n \t\t\t\t std::vector> *buffers);\n \ndiff --git a/src/libcamera/converter/converter_dw100.cpp b/src/libcamera/converter/converter_dw100.cpp\nindex 1d2d0435b08e..f0764ac8229e 100644\n--- a/src/libcamera/converter/converter_dw100.cpp\n+++ b/src/libcamera/converter/converter_dw100.cpp\n@@ -7,9 +7,12 @@\n \n #include \"libcamera/internal/converter/converter_dw100.h\"\n \n+#include \n+\n #include \n \n #include \n+#include \n \n #include \"libcamera/internal/media_device.h\"\n #include \"libcamera/internal/v4l2_videodevice.h\"\n@@ -34,4 +37,75 @@ ConverterDW100::ConverterDW100(std::shared_ptr media)\n {\n }\n \n+/**\n+ * \\brief Apply the vertex map for a given stream\n+ * \\param[in] stream The stream to update\n+ * \\param[in] request An optional request\n+ *\n+ * This function updates the vertex map on the stream \\a stream. If \\a request\n+ * is provided, the updated happens in that request.\n+ *\n+ * \\return 0 on success or a negative error code otherwise\n+ */\n+int ConverterDW100::applyVertexMap(const Stream *stream, const V4L2Request *request)\n+{\n+\tauto iter = streams_.find(stream);\n+\tif (iter == streams_.end())\n+\t\treturn -EINVAL;\n+\n+\treturn dynamic_cast(iter->second.get())->applyVertexMap(request);\n+}\n+\n+/**\n+ * \\brief Get the vertex map for a stream\n+ * \\param[in] stream The stream\n+ *\n+ * This function returns a reference to the vertex map of the stream \\a stream.\n+ *\n+ * \\return The vertex map\n+ */\n+Dw100VertexMap &ConverterDW100::vertexMap(const Stream *stream)\n+{\n+\tauto iter = streams_.find(stream);\n+\tV4L2M2MConverter::V4L2M2MStream *s = iter->second.get();\n+\tASSERT(s);\n+\treturn dynamic_cast(s)->vertexMap_;\n+}\n+\n+std::unique_ptr ConverterDW100::makeStream(const Stream *stream)\n+{\n+\treturn std::unique_ptr(new DW100Stream(this, stream));\n+}\n+\n+ConverterDW100::DW100Stream::DW100Stream(V4L2M2MConverter *converter,\n+\t\t\t\t\t const Stream *stream)\n+\t: V4L2M2MConverter::V4L2M2MStream(converter, stream)\n+{\n+}\n+\n+int ConverterDW100::DW100Stream::configure(const StreamConfiguration &inputCfg,\n+\t\t\t\t\t const StreamConfiguration &outputCfg)\n+{\n+\tint ret;\n+\tret = V4L2M2MConverter::V4L2M2MStream::configure(inputCfg, outputCfg);\n+\tif (ret)\n+\t\treturn ret;\n+\n+\t/* Todo: is that comment still valid?\n+\t For actual dewarping we need the active area of the sensor mode here. */\n+\tvertexMap_.setInputSize(inputCfg.size);\n+\tvertexMap_.setOutputSize(outputCfg.size);\n+\treturn 0;\n+}\n+\n+int ConverterDW100::DW100Stream::applyVertexMap(const V4L2Request *request)\n+{\n+\tstd::vector map = vertexMap_.getVertexMap();\n+\tauto value = Span(reinterpret_cast(&map[0]), map.size());\n+\n+\tControlList ctrls;\n+\tctrls.set(V4L2_CID_DW100_DEWARPING_16x16_VERTEX_MAP, value);\n+\treturn applyControls(ctrls, request);\n+}\n+\n } /* namespace libcamera */\n","prefixes":["v2","21/35"]}