Patch Detail
Show a patch.
GET /api/1.1/patches/13356/?format=api
{ "id": 13356, "url": "https://patchwork.libcamera.org/api/1.1/patches/13356/?format=api", "web_url": "https://patchwork.libcamera.org/patch/13356/", "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": "<20210814050912.15113-4-umang.jain@ideasonboard.com>", "date": "2021-08-14T05:09:11", "name": "[libcamera-devel,v3,3/4] ipa: vimc: Map and unmap buffers", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "b71dd25c176c497f4a057629a007fdff1a0af790", "submitter": { "id": 86, "url": "https://patchwork.libcamera.org/api/1.1/people/86/?format=api", "name": "Umang Jain", "email": "umang.jain@ideasonboard.com" }, "delegate": { "id": 12, "url": "https://patchwork.libcamera.org/api/1.1/users/12/?format=api", "username": "uajain", "first_name": "Umang", "last_name": "Jain", "email": "umang.jain@ideasonboard.com" }, "mbox": "https://patchwork.libcamera.org/patch/13356/mbox/", "series": [ { "id": 2358, "url": "https://patchwork.libcamera.org/api/1.1/series/2358/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=2358", "date": "2021-08-14T05:09:08", "name": "Pass buffers to VIMC IPA", "version": 3, "mbox": "https://patchwork.libcamera.org/series/2358/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/13356/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/13356/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 8B787BD87D\n\tfor <parsemail@patchwork.libcamera.org>;\n\tSat, 14 Aug 2021 05:09:32 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 43C5A68893;\n\tSat, 14 Aug 2021 07:09:32 +0200 (CEST)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id A802968891\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tSat, 14 Aug 2021 07:09:30 +0200 (CEST)", "from perceval.ideasonboard.com (unknown [103.251.226.70])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id A7A623E5;\n\tSat, 14 Aug 2021 07:09:29 +0200 (CEST)" ], "Authentication-Results": "lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"rfBq1epA\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1628917770;\n\tbh=oQ1q0UJSctsG617etS52rZEGQn1xPZrsfidpYHZoOlE=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=rfBq1epAbxzbFkW6ze4NTlOepOttAjx5twXesjbChHwU7woZKfxnoZ64nnSyjp158\n\t9HDPkKVobMpRF9crB7QlsSE4u1JEDVj1zBKLVRyehVm2vapib9KchMV8AxiSx5o4QO\n\tfxSYQLTCrxbS6LGrO9zfmO1+J5nvN+CX6BLER7WE=", "From": "Umang Jain <umang.jain@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Sat, 14 Aug 2021 10:39:11 +0530", "Message-Id": "<20210814050912.15113-4-umang.jain@ideasonboard.com>", "X-Mailer": "git-send-email 2.31.1", "In-Reply-To": "<20210814050912.15113-1-umang.jain@ideasonboard.com>", "References": "<20210814050912.15113-1-umang.jain@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v3 3/4] ipa: vimc: Map and unmap buffers", "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": "VIMC pipeline handler have dmabuf-backed mock FrameBuffers which are\nspecifically targetted mimicking IPA buffers (parameter and statistics).\nMap these mock buffers to the VIMC IPA that would enable exercising IPA\nIPC code paths. This will provide leverage to our test suite to test\nIPA IPC code paths, which are common to various platforms.\n\nSigned-off-by: Umang Jain <umang.jain@ideasonboard.com>\n---\n include/libcamera/ipa/vimc.mojom | 3 +++\n src/ipa/vimc/vimc.cpp | 27 +++++++++++++++++++++++++++\n src/libcamera/pipeline/vimc/vimc.cpp | 15 +++++++++++++++\n 3 files changed, 45 insertions(+)", "diff": "diff --git a/include/libcamera/ipa/vimc.mojom b/include/libcamera/ipa/vimc.mojom\nindex ee66353d..8cb240d3 100644\n--- a/include/libcamera/ipa/vimc.mojom\n+++ b/include/libcamera/ipa/vimc.mojom\n@@ -26,6 +26,9 @@ interface IPAVimcInterface {\n \n \tstart() => (int32 ret);\n \tstop();\n+\n+\tmapBuffers(array<libcamera.IPABuffer> buffers);\n+\tunmapBuffers(array<uint32> ids);\n };\n \n interface IPAVimcEventInterface {\ndiff --git a/src/ipa/vimc/vimc.cpp b/src/ipa/vimc/vimc.cpp\nindex fb134084..7d9d22d0 100644\n--- a/src/ipa/vimc/vimc.cpp\n+++ b/src/ipa/vimc/vimc.cpp\n@@ -19,6 +19,8 @@\n #include <libcamera/ipa/ipa_interface.h>\n #include <libcamera/ipa/ipa_module_info.h>\n \n+#include \"libcamera/internal/mapped_framebuffer.h\"\n+\n namespace libcamera {\n \n LOG_DEFINE_CATEGORY(IPAVimc)\n@@ -38,11 +40,15 @@ public:\n \t\t const std::map<unsigned int, IPAStream> &streamConfig,\n \t\t const std::map<unsigned int, ControlInfoMap> &entityControls) override;\n \n+\tvoid mapBuffers(const std::vector<IPABuffer> &buffers) override;\n+\tvoid unmapBuffers(const std::vector<unsigned int> &ids) override;\n+\n private:\n \tvoid initTrace();\n \tvoid trace(enum ipa::vimc::IPAOperationCode operation);\n \n \tint fd_;\n+\tstd::map<unsigned int, MappedFrameBuffer> buffers_;\n };\n \n IPAVimc::IPAVimc()\n@@ -99,6 +105,27 @@ int IPAVimc::configure([[maybe_unused]] const IPACameraSensorInfo &sensorInfo,\n \treturn 0;\n }\n \n+void IPAVimc::mapBuffers(const std::vector<IPABuffer> &buffers)\n+{\n+\tfor (const IPABuffer &buffer : buffers) {\n+\t\tconst FrameBuffer fb(buffer.planes);\n+\t\tbuffers_.emplace(std::piecewise_construct,\n+\t\t\t\t std::forward_as_tuple(buffer.id),\n+\t\t\t\t std::forward_as_tuple(&fb, MappedFrameBuffer::MapFlag::Read));\n+\t}\n+}\n+\n+void IPAVimc::unmapBuffers(const std::vector<unsigned int> &ids)\n+{\n+\tfor (unsigned int id : ids) {\n+\t\tauto it = buffers_.find(id);\n+\t\tif (it == buffers_.end())\n+\t\t\tcontinue;\n+\n+\t\tbuffers_.erase(it);\n+\t}\n+}\n+\n void IPAVimc::initTrace()\n {\n \tstruct stat fifoStat;\ndiff --git a/src/libcamera/pipeline/vimc/vimc.cpp b/src/libcamera/pipeline/vimc/vimc.cpp\nindex 2dfa1418..b08325c2 100644\n--- a/src/libcamera/pipeline/vimc/vimc.cpp\n+++ b/src/libcamera/pipeline/vimc/vimc.cpp\n@@ -334,6 +334,15 @@ int PipelineHandlerVimc::start(Camera *camera, [[maybe_unused]] const ControlLis\n \tif (ret < 0)\n \t\treturn ret;\n \n+\t/* Map the mock IPA buffers to VIMC IPA to exercise IPC code paths */\n+\tunsigned int ipaBufferId = 1;\n+\tstd::vector<IPABuffer> ipaBuffers;\n+\tfor (auto [i, buffer] : utils::enumerate(data->mockIPABufs_)) {\n+\t\tbuffer->setCookie(ipaBufferId++);\n+\t\tipaBuffers.emplace_back(buffer->cookie(), buffer->planes());\n+\t}\n+\tdata->ipa_->mapBuffers(ipaBuffers);\n+\n \tret = data->ipa_->start();\n \tif (ret) {\n \t\tdata->video_->releaseBuffers();\n@@ -354,7 +363,13 @@ void PipelineHandlerVimc::stop(Camera *camera)\n {\n \tVimcCameraData *data = cameraData(camera);\n \tdata->video_->streamOff();\n+\n+\tstd::vector<unsigned int> ids;\n+\tfor (const std::unique_ptr<FrameBuffer> &buffer : data->mockIPABufs_)\n+\t\tids.push_back(buffer->cookie());\n+\tdata->ipa_->unmapBuffers(ids);\n \tdata->ipa_->stop();\n+\n \tdata->video_->releaseBuffers();\n }\n \n", "prefixes": [ "libcamera-devel", "v3", "3/4" ] }