{"id":17152,"url":"https://patchwork.libcamera.org/api/1.1/patches/17152/?format=json","web_url":"https://patchwork.libcamera.org/patch/17152/","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":"<20220818064923.2573060-7-paul.elder@ideasonboard.com>","date":"2022-08-18T06:49:21","name":"[libcamera-devel,v2,6/7,TEST] ipa: vimc: Add IPAOperationCode to init() parameter list","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"00cc01fffe373fd77585fb72350351c7e7575015","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/1.1/people/17/?format=json","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/17152/mbox/","series":[{"id":3424,"url":"https://patchwork.libcamera.org/api/1.1/series/3424/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=3424","date":"2022-08-18T06:49:15","name":"utils: ipc: Add support for enums and Flags","version":2,"mbox":"https://patchwork.libcamera.org/series/3424/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/17152/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/17152/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 DF6DEC3272\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu, 18 Aug 2022 06:49:49 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id A160161FD1;\n\tThu, 18 Aug 2022 08:49:49 +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 EE1ED61FA3\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 18 Aug 2022 08:49:47 +0200 (CEST)","from pyrite.rasen.tech (KD027085204050.au-net.ne.jp [27.85.204.50])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 9BA1056D;\n\tThu, 18 Aug 2022 08:49:46 +0200 (CEST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1660805389;\n\tbh=npUDbZLGool3VOVqx9GoDbsppFUywqhIh7ngaY1b6BI=;\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=NL2iopJy7cVz2Vz7RP7ulskBJzW33igBjvUeihR/0lRsTB/IM7t5Y8q7kxlrNPXCt\n\tZZw7II4xs4z6F5nOp3TqReR7fLgXutxTTCcpzxTc+lpVQ8aZBXs2KT47UJZhFH//hY\n\tubTFWqyw3UU3ettkNnEeQfgsArIK0qvoTqD7APp6AATq68yYWay2b5ByFuBnNyDzZ9\n\tNH3a9kdfRo3QhRWyLS5AO7QxnNenalcAbksvr4RF2vbl2YfLTzfl9T8ndJ/+wStjg3\n\tVohLXonfnMPBTrzP5KBGKlx1qytDZyLiJ2psdly4+0wJTxDxto5jdd3pQZIteKeWU0\n\t1PZrR9hkmThIg==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1660805387;\n\tbh=npUDbZLGool3VOVqx9GoDbsppFUywqhIh7ngaY1b6BI=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=vjW4o2p51VXRRl9I1JD9O4s9Y2UqBLNmvHTc1kIllLTUztydiNf/oyhogcUUMTQs3\n\tXEuVyZjIh+OwjERw7EzxzkAAwyZAmAYOK0NGN8xLxC1XzB8r5tw18d/Ec4weyfNUSo\n\tXI/d9DqDT4Ieft23XPZhc240ah5F7b2ARwBMAdAw="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"vjW4o2p5\"; dkim-atps=neutral","To":"libcamera-devel@lists.libcamera.org","Date":"Thu, 18 Aug 2022 15:49:21 +0900","Message-Id":"<20220818064923.2573060-7-paul.elder@ideasonboard.com>","X-Mailer":"git-send-email 2.30.2","In-Reply-To":"<20220818064923.2573060-1-paul.elder@ideasonboard.com>","References":"<20220818064923.2573060-1-paul.elder@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v2 6/7] [TEST] ipa: vimc: Add\n\tIPAOperationCode to init() parameter list","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 enums in function\nparameters, add IPAOperationCode to the parameter list of init().\n\nSigned-off-by: Paul Elder <paul.elder@ideasonboard.com>\n\n---\nNo changes in v2\n---\n include/libcamera/ipa/vimc.mojom     | 2 +-\n src/ipa/vimc/vimc.cpp                | 6 ++++--\n src/libcamera/pipeline/vimc/vimc.cpp | 2 +-\n test/ipa/ipa_interface_test.cpp      | 2 +-\n 4 files changed, 7 insertions(+), 5 deletions(-)","diff":"diff --git a/include/libcamera/ipa/vimc.mojom b/include/libcamera/ipa/vimc.mojom\nindex 718b9674..16149787 100644\n--- a/include/libcamera/ipa/vimc.mojom\n+++ b/include/libcamera/ipa/vimc.mojom\n@@ -18,7 +18,7 @@ enum IPAOperationCode {\n };\n \n interface IPAVimcInterface {\n-\tinit(libcamera.IPASettings settings) => (int32 ret);\n+\tinit(libcamera.IPASettings settings, IPAOperationCode code) => (int32 ret);\n \n \tconfigure(libcamera.IPACameraSensorInfo sensorInfo,\n \t\t  map<uint32, libcamera.IPAStream> streamConfig,\ndiff --git a/src/ipa/vimc/vimc.cpp b/src/ipa/vimc/vimc.cpp\nindex 85afb279..6bf39a1c 100644\n--- a/src/ipa/vimc/vimc.cpp\n+++ b/src/ipa/vimc/vimc.cpp\n@@ -31,7 +31,7 @@ public:\n \tIPAVimc();\n \t~IPAVimc();\n \n-\tint init(const IPASettings &settings) override;\n+\tint init(const IPASettings &settings, const ipa::vimc::IPAOperationCode &code) override;\n \n \tint start() override;\n \tvoid stop() override;\n@@ -66,7 +66,7 @@ IPAVimc::~IPAVimc()\n \t\t::close(fd_);\n }\n \n-int IPAVimc::init(const IPASettings &settings)\n+int IPAVimc::init(const IPASettings &settings, const ipa::vimc::IPAOperationCode &code)\n {\n \ttrace(ipa::vimc::IPAOperationInit);\n \n@@ -74,6 +74,8 @@ int IPAVimc::init(const IPASettings &settings)\n \t\t<< \"initializing vimc IPA with configuration file \"\n \t\t<< settings.configurationFile;\n \n+\tLOG(IPAVimc, Debug) << \"Got opcode \" << code;\n+\n \tFile conf(settings.configurationFile);\n \tif (!conf.open(File::OpenModeFlag::ReadOnly)) {\n \t\tLOG(IPAVimc, Error) << \"Failed to open configuration file\";\ndiff --git a/src/libcamera/pipeline/vimc/vimc.cpp b/src/libcamera/pipeline/vimc/vimc.cpp\nindex 153cf849..983bd514 100644\n--- a/src/libcamera/pipeline/vimc/vimc.cpp\n+++ b/src/libcamera/pipeline/vimc/vimc.cpp\n@@ -471,7 +471,7 @@ 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() });\n+\tdata->ipa_->init(IPASettings{ conf, data->sensor_->model() }, ipa::vimc::IPAOperationInit);\n \n \t/* Create and register the camera. */\n \tstd::set<Stream *> streams{ &data->stream_ };\ndiff --git a/test/ipa/ipa_interface_test.cpp b/test/ipa/ipa_interface_test.cpp\nindex 3c0df843..b9fa15cd 100644\n--- a/test/ipa/ipa_interface_test.cpp\n+++ b/test/ipa/ipa_interface_test.cpp\n@@ -106,7 +106,7 @@ 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\" });\n+\t\tint ret = ipa_->init(IPASettings{ conf, \"vimc\" }, ipa::vimc::IPAOperationInit);\n \t\tif (ret < 0) {\n \t\t\tcerr << \"IPA interface init() failed\" << endl;\n \t\t\treturn TestFail;\n","prefixes":["libcamera-devel","v2","6/7","TEST"]}