{"id":11969,"url":"https://patchwork.libcamera.org/api/patches/11969/?format=json","web_url":"https://patchwork.libcamera.org/patch/11969/","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":"<20210416160411.68226-1-kieran.bingham@ideasonboard.com>","date":"2021-04-16T16:04:11","name":"[libcamera-devel] ipa: ipu3: Move the IPA to the ipa::ipu3 namespace","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"43d2b305aff34837f9556921bee596fcde806aa1","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/?format=json","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/11969/mbox/","series":[{"id":1942,"url":"https://patchwork.libcamera.org/api/series/1942/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1942","date":"2021-04-16T16:04:11","name":"[libcamera-devel] ipa: ipu3: Move the IPA to the ipa::ipu3 namespace","version":1,"mbox":"https://patchwork.libcamera.org/series/1942/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/11969/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/11969/checks/","tags":{},"headers":{"Return-Path":"","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 F1073BD235\n\tfor ;\n\tFri, 16 Apr 2021 16:04:16 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id AEE5E6880A;\n\tFri, 16 Apr 2021 18:04: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 CEE9A68806\n\tfor ;\n\tFri, 16 Apr 2021 18:04:14 +0200 (CEST)","from Q.local (cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net\n\t[86.31.172.11])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 6DEC75A5;\n\tFri, 16 Apr 2021 18:04:14 +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=\"nVqPlzuN\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1618589054;\n\tbh=hgDMSbOudkIkJKVapIIk5M10CeXcPk1dBHXysOLj1s4=;\n\th=From:To:Cc:Subject:Date:From;\n\tb=nVqPlzuNvALR4jo00QLynGlux1zenLjTxekLGVEgt3u6AN1qEPVxYg4ImEnkLxaFA\n\tznq7Oxlol5rp+AdvVfQ9d9DDPv2RKWLFem+YVKczqCDjXYN4iWIlE+vi4m+dZqSSU0\n\tQ3GNwHIwu8RX9Yb4SZc96jj08kKQi9O9meP6vZFc=","From":"Kieran Bingham ","To":"libcamera devel ","Date":"Fri, 16 Apr 2021 17:04:11 +0100","Message-Id":"<20210416160411.68226-1-kieran.bingham@ideasonboard.com>","X-Mailer":"git-send-email 2.25.1","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH] ipa: ipu3: Move the IPA to the ipa::ipu3\n\tnamespace","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Simplify name-spacing of the IPU3 components by placing it in the\nipa::ipu3 namespace directly.\n\nSigned-off-by: Kieran Bingham \n---\n src/ipa/ipu3/ipu3.cpp | 34 +++++++++++++++++++++-------------\n 1 file changed, 21 insertions(+), 13 deletions(-)","diff":"diff --git a/src/ipa/ipu3/ipu3.cpp b/src/ipa/ipu3/ipu3.cpp\nindex 34a907f23ef5..edd325555b51 100644\n--- a/src/ipa/ipu3/ipu3.cpp\n+++ b/src/ipa/ipu3/ipu3.cpp\n@@ -25,7 +25,11 @@ namespace libcamera {\n \n LOG_DEFINE_CATEGORY(IPAIPU3)\n \n-class IPAIPU3 : public ipa::ipu3::IPAIPU3Interface\n+namespace ipa {\n+\n+namespace ipu3 {\n+\n+class IPAIPU3 : public IPAIPU3Interface\n {\n public:\n \tint init([[maybe_unused]] const IPASettings &settings) override\n@@ -40,7 +44,7 @@ public:\n \n \tvoid mapBuffers(const std::vector &buffers) override;\n \tvoid unmapBuffers(const std::vector &ids) override;\n-\tvoid processEvent(const ipa::ipu3::IPU3Event &event) override;\n+\tvoid processEvent(const IPU3Event &event) override;\n \n private:\n \tvoid processControls(unsigned int frame, const ControlList &controls);\n@@ -119,14 +123,14 @@ void IPAIPU3::unmapBuffers(const std::vector &ids)\n \t}\n }\n \n-void IPAIPU3::processEvent(const ipa::ipu3::IPU3Event &event)\n+void IPAIPU3::processEvent(const IPU3Event &event)\n {\n \tswitch (event.op) {\n-\tcase ipa::ipu3::EventProcessControls: {\n+\tcase EventProcessControls: {\n \t\tprocessControls(event.frame, event.controls);\n \t\tbreak;\n \t}\n-\tcase ipa::ipu3::EventStatReady: {\n+\tcase EventStatReady: {\n \t\tauto it = buffers_.find(event.bufferId);\n \t\tif (it == buffers_.end()) {\n \t\t\tLOG(IPAIPU3, Error) << \"Could not find stats buffer!\";\n@@ -140,7 +144,7 @@ void IPAIPU3::processEvent(const ipa::ipu3::IPU3Event &event)\n \t\tparseStatistics(event.frame, stats);\n \t\tbreak;\n \t}\n-\tcase ipa::ipu3::EventFillParams: {\n+\tcase EventFillParams: {\n \t\tauto it = buffers_.find(event.bufferId);\n \t\tif (it == buffers_.end()) {\n \t\t\tLOG(IPAIPU3, Error) << \"Could not find param buffer!\";\n@@ -173,8 +177,8 @@ void IPAIPU3::fillParams(unsigned int frame, ipu3_uapi_params *params)\n \n \t/* \\todo Fill in parameters buffer. */\n \n-\tipa::ipu3::IPU3Action op;\n-\top.op = ipa::ipu3::ActionParamFilled;\n+\tIPU3Action op;\n+\top.op = ActionParamFilled;\n \n \tqueueFrameAction.emit(frame, op);\n }\n@@ -187,8 +191,8 @@ void IPAIPU3::parseStatistics(unsigned int frame,\n \t/* \\todo React to statistics and update internal state machine. */\n \t/* \\todo Add meta-data information to ctrls. */\n \n-\tipa::ipu3::IPU3Action op;\n-\top.op = ipa::ipu3::ActionMetadataReady;\n+\tIPU3Action op;\n+\top.op = ActionMetadataReady;\n \top.controls = ctrls;\n \n \tqueueFrameAction.emit(frame, op);\n@@ -196,8 +200,8 @@ void IPAIPU3::parseStatistics(unsigned int frame,\n \n void IPAIPU3::setControls(unsigned int frame)\n {\n-\tipa::ipu3::IPU3Action op;\n-\top.op = ipa::ipu3::ActionSetSensorControls;\n+\tIPU3Action op;\n+\top.op = ActionSetSensorControls;\n \n \tControlList ctrls(ctrls_);\n \tctrls.set(V4L2_CID_EXPOSURE, static_cast(exposure_));\n@@ -207,6 +211,10 @@ void IPAIPU3::setControls(unsigned int frame)\n \tqueueFrameAction.emit(frame, op);\n }\n \n+} /* namespace ipu3 */\n+\n+} /* namespace ipa */\n+\n /*\n * External IPA module interface\n */\n@@ -221,7 +229,7 @@ const struct IPAModuleInfo ipaModuleInfo = {\n \n IPAInterface *ipaCreate()\n {\n-\treturn new IPAIPU3();\n+\treturn new ipa::ipu3::IPAIPU3();\n }\n }\n \n","prefixes":["libcamera-devel"]}