Patch Detail
Show a patch.
GET /api/patches/16944/?format=api
{ "id": 16944, "url": "https://patchwork.libcamera.org/api/patches/16944/?format=api", "web_url": "https://patchwork.libcamera.org/patch/16944/", "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": "<20220803112150.3040287-10-paul.elder@ideasonboard.com>", "date": "2022-08-03T11:21:50", "name": "[libcamera-devel,9/9,TEST] ipa: vimc: Add Flags to parameters", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "6e7b44d255a853e3e00a6d3ba3903fa1e9d49f3a", "submitter": { "id": 17, "url": "https://patchwork.libcamera.org/api/people/17/?format=api", "name": "Paul Elder", "email": "paul.elder@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/16944/mbox/", "series": [ { "id": 3367, "url": "https://patchwork.libcamera.org/api/series/3367/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=3367", "date": "2022-08-03T11:21:41", "name": "utils: ipc: Add support for enums and Flags", "version": 1, "mbox": "https://patchwork.libcamera.org/series/3367/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/16944/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/16944/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 5CD61BE173\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 3 Aug 2022 11:22:16 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 0D8C963327;\n\tWed, 3 Aug 2022 13:22:16 +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 539DA6332A\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 3 Aug 2022 13:22:14 +0200 (CEST)", "from pyrite.rasen.tech (h175-177-042-159.catv02.itscom.jp\n\t[175.177.42.159])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 264C18B;\n\tWed, 3 Aug 2022 13:22:12 +0200 (CEST)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1659525736;\n\tbh=JroTs5NeD38Hq9kJl2/agSUMu4kG6U1mejM7F4NzBwY=;\n\th=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:\n\tFrom;\n\tb=FaMXPSx1PsQebQdviPnho52t05mK3zLW10SSqeKwMt2IT7ol6UzfXW1ODChZ+kq52\n\t9FDTr1EgtGLPw/xxxCnPCP63eONy8Jp2J+2n+s3zbYHZtMWB24apg0ck0VYFDTg8KL\n\tk1v4IoaqgW9a7Ul8KlNgWiWkMp+UF1/lDbhYcUw0iBUhCCI2pqocuBzCGUmezCd6qR\n\tgYxnt8x3xvuWRAmsm0w/qCKt+r0P7qs5rwbejkGmKoFpcJpb0DYU44LbsTRKaLf6dQ\n\t4WhBjumK/7puh8A3WS2aZzLD27piFrnwaNQMce/DHjktXKNz0xDe5zRSyQOVQYuhoH\n\tbkSjUZXksDdgQ==", "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1659525734;\n\tbh=JroTs5NeD38Hq9kJl2/agSUMu4kG6U1mejM7F4NzBwY=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=X5zocdWkzEztJLtnM3lhCn+8ZG2neiu4DkmA9gQPUFEa2IMDi5SPcbIEOUr4JJxfM\n\t9KylRaElEj+KbHPEjHaMnBC9W9EcUbc6zOMFqdDtwTbAQyIIlWKNtGEppar24orIMf\n\tOgthhhvezqvfGcwJ0GtBZPumigLzn5iv1jhAi1YA=" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"X5zocdWk\"; dkim-atps=neutral", "To": "libcamera-devel@lists.libcamera.org", "Date": "Wed, 3 Aug 2022 20:21:50 +0900", "Message-Id": "<20220803112150.3040287-10-paul.elder@ideasonboard.com>", "X-Mailer": "git-send-email 2.30.2", "In-Reply-To": "<20220803112150.3040287-1-paul.elder@ideasonboard.com>", "References": "<20220803112150.3040287-1-paul.elder@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH 9/9] [TEST] ipa: vimc: Add Flags to\n\tparameters", "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>", "From": "Paul Elder via libcamera-devel <libcamera-devel@lists.libcamera.org>", "Reply-To": "Paul Elder <paul.elder@ideasonboard.com>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "For the purpose of testing serializing/deserializing Flags in function\nparameters, add an enum class TestFlags and Flags<TestFlags> to some\nfunction parameters, both for input and output and Signals.\n\nWhile at it, update the ipa_interface_test.\n\nSigned-off-by: Paul Elder <paul.elder@ideasonboard.com>\n---\n include/libcamera/ipa/vimc.mojom | 13 +++++++++++--\n src/ipa/vimc/vimc.cpp | 21 +++++++++++++++++----\n src/libcamera/pipeline/vimc/vimc.cpp | 16 +++++++++++++---\n test/ipa/ipa_interface_test.cpp | 6 +++++-\n 4 files changed, 46 insertions(+), 10 deletions(-)", "diff": "diff --git a/include/libcamera/ipa/vimc.mojom b/include/libcamera/ipa/vimc.mojom\nindex 16149787..8c718fdd 100644\n--- a/include/libcamera/ipa/vimc.mojom\n+++ b/include/libcamera/ipa/vimc.mojom\n@@ -17,8 +17,17 @@ enum IPAOperationCode {\n \tIPAOperationStop,\n };\n \n+enum Flags_TestFlags_t {\n+\tFlag1 = 0x1,\n+\tFlag2 = 0x2,\n+\tFlag3 = 0x4,\n+\tFlag4 = 0x8,\n+};\n+\n interface IPAVimcInterface {\n-\tinit(libcamera.IPASettings settings, IPAOperationCode code) => (int32 ret);\n+\tinit(libcamera.IPASettings settings,\n+\t IPAOperationCode code,\n+\t Flags_TestFlags_t inFlags) => (int32 ret, Flags_TestFlags_t outFlags);\n \n \tconfigure(libcamera.IPACameraSensorInfo sensorInfo,\n \t\t map<uint32, libcamera.IPAStream> streamConfig,\n@@ -41,5 +50,5 @@ interface IPAVimcInterface {\n };\n \n interface IPAVimcEventInterface {\n-\tparamsBufferReady(uint32 bufferId);\n+\tparamsBufferReady(uint32 bufferId, Flags_TestFlags_t flags);\n };\ndiff --git a/src/ipa/vimc/vimc.cpp b/src/ipa/vimc/vimc.cpp\nindex 6bf39a1c..bb4ca355 100644\n--- a/src/ipa/vimc/vimc.cpp\n+++ b/src/ipa/vimc/vimc.cpp\n@@ -31,7 +31,10 @@ public:\n \tIPAVimc();\n \t~IPAVimc();\n \n-\tint init(const IPASettings &settings, const ipa::vimc::IPAOperationCode &code) override;\n+\tint init(const IPASettings &settings,\n+\t\t const ipa::vimc::IPAOperationCode &code,\n+\t\t const Flags<ipa::vimc::TestFlags> &inFlags,\n+\t\t Flags<ipa::vimc::TestFlags> *outFlags) override;\n \n \tint start() override;\n \tvoid stop() override;\n@@ -65,8 +68,10 @@ IPAVimc::~IPAVimc()\n \tif (fd_ != -1)\n \t\t::close(fd_);\n }\n-\n-int IPAVimc::init(const IPASettings &settings, const ipa::vimc::IPAOperationCode &code)\n+int IPAVimc::init(const IPASettings &settings,\n+\t\t const ipa::vimc::IPAOperationCode &code,\n+\t\t const Flags<ipa::vimc::TestFlags> &inFlags,\n+\t\t Flags<ipa::vimc::TestFlags> *outFlags)\n {\n \ttrace(ipa::vimc::IPAOperationInit);\n \n@@ -76,6 +81,13 @@ int IPAVimc::init(const IPASettings &settings, const ipa::vimc::IPAOperationCode\n \n \tLOG(IPAVimc, Debug) << \"Got opcode \" << code;\n \n+\tLOG(IPAVimc, Debug)\n+\t\t<< \"Flag 2 was \"\n+\t\t<< ((inFlags & ipa::vimc::TestFlags::Flag2) ? \"\" : \"not \")\n+\t\t<< \"set\";\n+\n+\t*outFlags |= ipa::vimc::TestFlags::Flag1;\n+\n \tFile conf(settings.configurationFile);\n \tif (!conf.open(File::OpenModeFlag::ReadOnly)) {\n \t\tLOG(IPAVimc, Error) << \"Failed to open configuration file\";\n@@ -144,7 +156,8 @@ void IPAVimc::fillParamsBuffer([[maybe_unused]] uint32_t frame, uint32_t bufferI\n \t\treturn;\n \t}\n \n-\tparamsBufferReady.emit(bufferId);\n+\tFlags<ipa::vimc::TestFlags> flags;\n+\tparamsBufferReady.emit(bufferId, flags);\n }\n \n void IPAVimc::initTrace()\ndiff --git a/src/libcamera/pipeline/vimc/vimc.cpp b/src/libcamera/pipeline/vimc/vimc.cpp\nindex 41b9d6f4..7798be0a 100644\n--- a/src/libcamera/pipeline/vimc/vimc.cpp\n+++ b/src/libcamera/pipeline/vimc/vimc.cpp\n@@ -54,7 +54,7 @@ public:\n \tint init();\n \tint allocateMockIPABuffers();\n \tvoid bufferReady(FrameBuffer *buffer);\n-\tvoid paramsBufferReady(unsigned int id);\n+\tvoid paramsBufferReady(unsigned int id, const Flags<ipa::vimc::TestFlags> &flags);\n \n \tMediaDevice *media_;\n \tstd::unique_ptr<CameraSensor> sensor_;\n@@ -471,7 +471,16 @@ bool PipelineHandlerVimc::match(DeviceEnumerator *enumerator)\n \tdata->ipa_->paramsBufferReady.connect(data.get(), &VimcCameraData::paramsBufferReady);\n \n \tstd::string conf = data->ipa_->configurationFile(\"vimc.conf\");\n-\tdata->ipa_->init(IPASettings{ conf, data->sensor_->model() }, ipa::vimc::IPAOperationInit);\n+\tFlags<ipa::vimc::TestFlags> inFlags;\n+\tFlags<ipa::vimc::TestFlags> outFlags;\n+\tinFlags |= ipa::vimc::TestFlags::Flag2;\n+\tdata->ipa_->init(IPASettings{ conf, data->sensor_->model() },\n+\t\t\t ipa::vimc::IPAOperationInit, inFlags, &outFlags);\n+\n+\tLOG(VIMC, Debug)\n+\t\t<< \"Flag 1 was \"\n+\t\t<< ((outFlags & ipa::vimc::TestFlags::Flag1) ? \"\" : \"not \")\n+\t\t<< \"set\";\n \n \t/* Create and register the camera. */\n \tstd::set<Stream *> streams{ &data->stream_ };\n@@ -608,7 +617,8 @@ int VimcCameraData::allocateMockIPABuffers()\n \treturn video_->exportBuffers(kBufCount, &mockIPABufs_);\n }\n \n-void VimcCameraData::paramsBufferReady([[maybe_unused]] unsigned int id)\n+void VimcCameraData::paramsBufferReady([[maybe_unused]] unsigned int id,\n+\t\t\t\t [[maybe_unused]] const Flags<ipa::vimc::TestFlags> &flags)\n {\n }\n \ndiff --git a/test/ipa/ipa_interface_test.cpp b/test/ipa/ipa_interface_test.cpp\nindex b9fa15cd..47c7352b 100644\n--- a/test/ipa/ipa_interface_test.cpp\n+++ b/test/ipa/ipa_interface_test.cpp\n@@ -106,7 +106,11 @@ protected:\n \n \t\t/* Test initialization of IPA module. */\n \t\tstd::string conf = ipa_->configurationFile(\"vimc.conf\");\n-\t\tint ret = ipa_->init(IPASettings{ conf, \"vimc\" }, ipa::vimc::IPAOperationInit);\n+\t\tFlags<ipa::vimc::TestFlags> inFlags;\n+\t\tFlags<ipa::vimc::TestFlags> outFlags;\n+\t\tint ret = ipa_->init(IPASettings{ conf, \"vimc\" },\n+\t\t\t\t ipa::vimc::IPAOperationInit,\n+\t\t\t\t inFlags, &outFlags);\n \t\tif (ret < 0) {\n \t\t\tcerr << \"IPA interface init() failed\" << endl;\n \t\t\treturn TestFail;\n", "prefixes": [ "libcamera-devel", "9/9", "TEST" ] }