Patch Detail
Show a patch.
GET /api/1.1/patches/17585/?format=api
{ "id": 17585, "url": "https://patchwork.libcamera.org/api/1.1/patches/17585/?format=api", "web_url": "https://patchwork.libcamera.org/patch/17585/", "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": "<20221011105859.457567-8-paul.elder@ideasonboard.com>", "date": "2022-10-11T10:58:57", "name": "[libcamera-devel,v5,7/9] ipa: vimc: Add Flags to parameters", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "934cc60bfc611c3557a47b56e4df5c3c159ef77b", "submitter": { "id": 17, "url": "https://patchwork.libcamera.org/api/1.1/people/17/?format=api", "name": "Paul Elder", "email": "paul.elder@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/17585/mbox/", "series": [ { "id": 3551, "url": "https://patchwork.libcamera.org/api/1.1/series/3551/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=3551", "date": "2022-10-11T10:58:50", "name": "utils: ipc: Add support for enums and Flags", "version": 5, "mbox": "https://patchwork.libcamera.org/series/3551/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/17585/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/17585/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 CDF65C0DA4\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 11 Oct 2022 10:59:28 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 801C062D8C;\n\tTue, 11 Oct 2022 12:59:28 +0200 (CEST)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id CC77862D89\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 11 Oct 2022 12:59:26 +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 37C10143F;\n\tTue, 11 Oct 2022 12:59:24 +0200 (CEST)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1665485968;\n\tbh=tKFHTURSlQvaDrHrXNj5/fCHdnYeOUzpiQ+L0XkayoY=;\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=Kau48gVwtfMzVyfd+q4nHFMEnxfgZL95xiLUAWdt8vc4WK/fOl8G5BJaPYGoFpP1s\n\tqwE8Y7QVkq32Mmz76ZTa/VWpWy98JnNBzSaLR8VTS2hL7P8zWZvr7KZaey6ao6QjVT\n\t1zte+7la2/idAYIHkCkb+MQYb95aP+HVAK8Ohi0qYyR6/ybywdPl1XQ4gxFgVFt8SW\n\t2XD+cwnCjQlu9xNd7CtENpzz7ya7axYGARbQo2O7syWeZWbABJFQ1oamjBb+qHuaP/\n\t/tkxInidJdCcsWOUXxjS7E0JMy4a+dwnXS3hz3fCF6UR849NXdhvobtU0PGMKcHPUD\n\tlqrHBfWub4p8g==", "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1665485966;\n\tbh=tKFHTURSlQvaDrHrXNj5/fCHdnYeOUzpiQ+L0XkayoY=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=HnyZKS+yAJjY+7mMo4Py9u6wyKDmwMe3AoTwvfT5EKA3VJAkw1Uwe9kbz8n1nfAGr\n\tPGSPAZghIJRghVq0MB6D3M+EJ7Csc88CGk2Bs5uogBdk8Lg0+HdxmTvMBca9CTZA+x\n\tIgUxnuvVXKkqQ2xc1E9v5xCv2idtx5sxsH4SUrU0=" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"HnyZKS+y\"; dkim-atps=neutral", "To": "libcamera-devel@lists.libcamera.org", "Date": "Tue, 11 Oct 2022 19:58:57 +0900", "Message-Id": "<20221011105859.457567-8-paul.elder@ideasonboard.com>", "X-Mailer": "git-send-email 2.30.2", "In-Reply-To": "<20221011105859.457567-1-paul.elder@ideasonboard.com>", "References": "<20221011105859.457567-1-paul.elder@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v5 7/9] ipa: vimc: Add Flags to parameters", "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>\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n\n---\nNo change in v5\n\nChanges in v4:\n- make flags also passed directly (as opposed to const references)\n- remove [TEST] from commit subject\n\nChanges in v3:\n- s/TestFlags/TestFlag/\n- add [scopedEnum] to enum Testflag\n\nChanges in v2:\n- use new attribute-based mojom definition for Flags\n---\n include/libcamera/ipa/vimc.mojom | 14 ++++++++++++--\n src/ipa/vimc/vimc.cpp | 20 +++++++++++++++++---\n src/libcamera/pipeline/vimc/vimc.cpp | 15 ++++++++++++---\n test/ipa/ipa_interface_test.cpp | 6 +++++-\n 4 files changed, 46 insertions(+), 9 deletions(-)", "diff": "diff --git a/include/libcamera/ipa/vimc.mojom b/include/libcamera/ipa/vimc.mojom\nindex 16149787..dd991f7e 100644\n--- a/include/libcamera/ipa/vimc.mojom\n+++ b/include/libcamera/ipa/vimc.mojom\n@@ -17,8 +17,18 @@ enum IPAOperationCode {\n \tIPAOperationStop,\n };\n \n+[scopedEnum] enum TestFlag {\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] TestFlag inFlags)\n+\t=> (int32 ret, [flags] TestFlag outFlags);\n \n \tconfigure(libcamera.IPACameraSensorInfo sensorInfo,\n \t\t map<uint32, libcamera.IPAStream> streamConfig,\n@@ -41,5 +51,5 @@ interface IPAVimcInterface {\n };\n \n interface IPAVimcEventInterface {\n-\tparamsBufferReady(uint32 bufferId);\n+\tparamsBufferReady(uint32 bufferId, [flags] TestFlag flags);\n };\ndiff --git a/src/ipa/vimc/vimc.cpp b/src/ipa/vimc/vimc.cpp\nindex 5d494b63..9256bbba 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::TestFlag> inFlags,\n+\t\t Flags<ipa::vimc::TestFlag> *outFlags) override;\n \n \tint start() override;\n \tvoid stop() override;\n@@ -66,7 +69,10 @@ IPAVimc::~IPAVimc()\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::TestFlag> inFlags,\n+\t\t Flags<ipa::vimc::TestFlag> *outFlags)\n {\n \ttrace(ipa::vimc::IPAOperationInit);\n \n@@ -76,6 +82,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::TestFlag::Flag2 ? \"\" : \"not \")\n+\t\t<< \"set\";\n+\n+\t*outFlags |= ipa::vimc::TestFlag::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 +157,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::TestFlag> 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 df749bf7..f85d05f7 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::TestFlag> flags);\n \n \tMediaDevice *media_;\n \tstd::unique_ptr<CameraSensor> sensor_;\n@@ -471,7 +471,15 @@ 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::TestFlag> inFlags = ipa::vimc::TestFlag::Flag2;\n+\tFlags<ipa::vimc::TestFlag> outFlags;\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::TestFlag::Flag1 ? \"\" : \"not \")\n+\t\t<< \"set\";\n \n \t/* Create and register the camera. */\n \tstd::set<Stream *> streams{ &data->stream_ };\n@@ -608,7 +616,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::TestFlag> flags)\n {\n }\n \ndiff --git a/test/ipa/ipa_interface_test.cpp b/test/ipa/ipa_interface_test.cpp\nindex cd20348a..051ef96e 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::TestFlag> inFlags;\n+\t\tFlags<ipa::vimc::TestFlag> 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", "v5", "7/9" ] }