{"id":12093,"url":"https://patchwork.libcamera.org/api/1.1/patches/12093/?format=json","web_url":"https://patchwork.libcamera.org/patch/12093/","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":"<20210423063919.26273-1-jeanmichel.hautbois@ideasonboard.com>","date":"2021-04-23T06:39:19","name":"[libcamera-devel] ipa: rkisp1: Move the IPA to the ipa::rkisp1 namespace","commit_ref":"8a2fb73337ffe562a25b4dd9cbdf2e78046da9f3","pull_url":null,"state":"accepted","archived":false,"hash":"f333bf76525caa7e6cace7d505c310a63575d895","submitter":{"id":75,"url":"https://patchwork.libcamera.org/api/1.1/people/75/?format=json","name":"Jean-Michel Hautbois","email":"jeanmichel.hautbois@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/12093/mbox/","series":[{"id":1969,"url":"https://patchwork.libcamera.org/api/1.1/series/1969/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1969","date":"2021-04-23T06:39:19","name":"[libcamera-devel] ipa: rkisp1: Move the IPA to the ipa::rkisp1 namespace","version":1,"mbox":"https://patchwork.libcamera.org/series/1969/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/12093/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/12093/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 ED6ADBDB1A\n\tfor ;\n\tFri, 23 Apr 2021 06:39:23 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 312D868873;\n\tFri, 23 Apr 2021 08:39:23 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id F1CFD68861\n\tfor ;\n\tFri, 23 Apr 2021 08:39:21 +0200 (CEST)","from localhost.localdomain (unknown\n\t[IPv6:2a01:e0a:169:7140:f55f:87fa:7523:c557])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 9C3A1332;\n\tFri, 23 Apr 2021 08:39:21 +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=\"FKCtpMTI\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1619159961;\n\tbh=sLyDX7RTwC/YtsGjTq7NiDQn57Vo3tsj6x9KYiuciWk=;\n\th=From:To:Cc:Subject:Date:From;\n\tb=FKCtpMTIavKIGidofeeKqSkkIZ/GgwNk+JnFliUyeidFJl7L4/cdgCQ9N/S9PV+y9\n\tSbSMmz3qYKzNIHXV6txG4vp8LCIgGtYtuwqyUZpDdX5UnVAX5FohQVfpXdzJw8ndPr\n\t7TTl5U4aW2ze4cMmh5yeusyyWrpwneUAaYKr0aBg=","From":"Jean-Michel Hautbois ","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 23 Apr 2021 08:39:19 +0200","Message-Id":"<20210423063919.26273-1-jeanmichel.hautbois@ideasonboard.com>","X-Mailer":"git-send-email 2.27.0","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH] ipa: rkisp1: Move the IPA to the\n\tipa::rkisp1 namespace","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 RKISP1 components by placing it in the\nipa::rkisp1 namespace directly.\n\nSigned-off-by: Jean-Michel Hautbois \n---\n src/ipa/rkisp1/rkisp1.cpp | 28 ++++++++++++++++------------\n 1 file changed, 16 insertions(+), 12 deletions(-)","diff":"diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp\nindex 8a57b080..6d45673c 100644\n--- a/src/ipa/rkisp1/rkisp1.cpp\n+++ b/src/ipa/rkisp1/rkisp1.cpp\n@@ -28,7 +28,9 @@ namespace libcamera {\n \n LOG_DEFINE_CATEGORY(IPARkISP1)\n \n-class IPARkISP1 : public ipa::rkisp1::IPARkISP1Interface\n+namespace ipa::rkisp1 {\n+\n+class IPARkISP1 : public IPARkISP1Interface\n {\n public:\n \tint init(unsigned int hwRevision) override;\n@@ -40,7 +42,7 @@ public:\n \t\t const std::map &entityControls) override;\n \tvoid mapBuffers(const std::vector &buffers) override;\n \tvoid unmapBuffers(const std::vector &ids) override;\n-\tvoid processEvent(const ipa::rkisp1::RkISP1Event &event) override;\n+\tvoid processEvent(const RkISP1Event &event) override;\n \n private:\n \tvoid queueRequest(unsigned int frame, rkisp1_params_cfg *params,\n@@ -171,10 +173,10 @@ void IPARkISP1::unmapBuffers(const std::vector &ids)\n \t}\n }\n \n-void IPARkISP1::processEvent(const ipa::rkisp1::RkISP1Event &event)\n+void IPARkISP1::processEvent(const RkISP1Event &event)\n {\n \tswitch (event.op) {\n-\tcase ipa::rkisp1::EventSignalStatBuffer: {\n+\tcase EventSignalStatBuffer: {\n \t\tunsigned int frame = event.frame;\n \t\tunsigned int bufferId = event.bufferId;\n \n@@ -184,7 +186,7 @@ void IPARkISP1::processEvent(const ipa::rkisp1::RkISP1Event &event)\n \t\tupdateStatistics(frame, stats);\n \t\tbreak;\n \t}\n-\tcase ipa::rkisp1::EventQueueRequest: {\n+\tcase EventQueueRequest: {\n \t\tunsigned int frame = event.frame;\n \t\tunsigned int bufferId = event.bufferId;\n \n@@ -215,8 +217,8 @@ void IPARkISP1::queueRequest(unsigned int frame, rkisp1_params_cfg *params,\n \t\tparams->module_en_update = RKISP1_CIF_ISP_MODULE_AEC;\n \t}\n \n-\tipa::rkisp1::RkISP1Action op;\n-\top.op = ipa::rkisp1::ActionParamFilled;\n+\tRkISP1Action op;\n+\top.op = ActionParamFilled;\n \n \tqueueFrameAction.emit(frame, op);\n }\n@@ -268,8 +270,8 @@ void IPARkISP1::updateStatistics(unsigned int frame,\n \n void IPARkISP1::setControls(unsigned int frame)\n {\n-\tipa::rkisp1::RkISP1Action op;\n-\top.op = ipa::rkisp1::ActionV4L2Set;\n+\tRkISP1Action op;\n+\top.op = ActionV4L2Set;\n \n \tControlList ctrls(ctrls_);\n \tctrls.set(V4L2_CID_EXPOSURE, static_cast(exposure_));\n@@ -286,13 +288,15 @@ void IPARkISP1::metadataReady(unsigned int frame, unsigned int aeState)\n \tif (aeState)\n \t\tctrls.set(controls::AeLocked, aeState == 2);\n \n-\tipa::rkisp1::RkISP1Action op;\n-\top.op = ipa::rkisp1::ActionMetadata;\n+\tRkISP1Action op;\n+\top.op = ActionMetadata;\n \top.controls = ctrls;\n \n \tqueueFrameAction.emit(frame, op);\n }\n \n+} /* namespace ipa::rkisp1 */\n+\n /*\n * External IPA module interface\n */\n@@ -307,7 +311,7 @@ const struct IPAModuleInfo ipaModuleInfo = {\n \n IPAInterface *ipaCreate()\n {\n-\treturn new IPARkISP1();\n+\treturn new ipa::rkisp1::IPARkISP1();\n }\n }\n \n","prefixes":["libcamera-devel"]}