{"id":17584,"url":"https://patchwork.libcamera.org/api/patches/17584/?format=json","web_url":"https://patchwork.libcamera.org/patch/17584/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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":"<20221011105859.457567-7-paul.elder@ideasonboard.com>","date":"2022-10-11T10:58:56","name":"[libcamera-devel,v5,6/9] ipa: vimc: Add IPAOperationCode to init() parameter list","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"662dd6f3a3dbe78ab733d7bc32f003cbe12e21df","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/people/17/?format=json","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/17584/mbox/","series":[{"id":3551,"url":"https://patchwork.libcamera.org/api/series/3551/?format=json","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/17584/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/17584/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 321EFC0DA4\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 11 Oct 2022 10:59:26 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id D9E9B62D87;\n\tTue, 11 Oct 2022 12:59:25 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id E54C862D76\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 11 Oct 2022 12:59:24 +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 4C80EAFC;\n\tTue, 11 Oct 2022 12:59:23 +0200 (CEST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1665485965;\n\tbh=a0wSkQwqJRJh/McpXgjcVKoZ5Ge2YAV2j16pAVOYYIk=;\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=ZfFPevY7HjzCXkll6N7zygS5ZEJnValBLmGxqo+JBiUDt12umPiPyFufvYUAMwRqh\n\t2QSljwZHZ6FY1O8wTbxWcOsuSmP1MSLfjXomBfr63EkjvHYWlcElBlsX+kMXWzKyOI\n\tCjhUtnKXRdbFHUnDemTuhngbf0ATU6ieAOEi2EHO/A92K8g9e4hrDFBK1jZYQQbB8z\n\tyXlF5C3qXurUoRBIrYvVX2BMv6mTvyGU6vKkjdJsHGFxcUnC06b846X4ZWcJtgyCnj\n\tTvf+MAMpEWdrM84UyDCguoEqS/o/xnmbBhQjUGNw8w2QBHA4P6MCYspiptWj+qKdtY\n\ttQlsOBl2lfEZQ==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1665485964;\n\tbh=a0wSkQwqJRJh/McpXgjcVKoZ5Ge2YAV2j16pAVOYYIk=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=udnrh5Bpjc/6iFWsJ4SUwQeQ/u6mU3H33Kj6XUUrfvLcUZRaIoOePimmvHpwHugv4\n\tm2VV3EbGqGOWpyIVSvWtyqg4lv4ZpF2GDo01mA362xbxQk4gK0T3OnJZnPTK/fgWuF\n\tK6L4CqJ/Df036cxhdGK65DvIPPiCQrxn9AAJBpZQ="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"udnrh5Bp\"; dkim-atps=neutral","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 11 Oct 2022 19:58:56 +0900","Message-Id":"<20221011105859.457567-7-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 6/9] ipa: vimc: Add IPAOperationCode to\n\tinit() 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>\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n\n---\nNo change in v5\n\nChanges in v4:\n- remove [TEST] from commit subject\n\nChanges in v3:\n- pass enum by value as opposed to by const reference\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..5d494b63 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 d2f2e460..df749bf7 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 6b93e976..cd20348a 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","v5","6/9"]}