From patchwork Fri Apr 16 16:04:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 11969 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id F1073BD235 for ; Fri, 16 Apr 2021 16:04:16 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id AEE5E6880A; Fri, 16 Apr 2021 18:04:16 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="nVqPlzuN"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id CEE9A68806 for ; Fri, 16 Apr 2021 18:04:14 +0200 (CEST) Received: from Q.local (cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 6DEC75A5; Fri, 16 Apr 2021 18:04:14 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1618589054; bh=hgDMSbOudkIkJKVapIIk5M10CeXcPk1dBHXysOLj1s4=; h=From:To:Cc:Subject:Date:From; b=nVqPlzuNvALR4jo00QLynGlux1zenLjTxekLGVEgt3u6AN1qEPVxYg4ImEnkLxaFA znq7Oxlol5rp+AdvVfQ9d9DDPv2RKWLFem+YVKczqCDjXYN4iWIlE+vi4m+dZqSSU0 Q3GNwHIwu8RX9Yb4SZc96jj08kKQi9O9meP6vZFc= 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 namespace X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Simplify name-spacing of the IPU3 components by placing it in the ipa::ipu3 namespace directly. Signed-off-by: Kieran Bingham Reviewed-by: Jean-Michel Hautbois Reviewed-by: Laurent Pinchart Reviewed-by: Umang Jain --- src/ipa/ipu3/ipu3.cpp | 34 +++++++++++++++++++++------------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/src/ipa/ipu3/ipu3.cpp b/src/ipa/ipu3/ipu3.cpp index 34a907f23ef5..edd325555b51 100644 --- a/src/ipa/ipu3/ipu3.cpp +++ b/src/ipa/ipu3/ipu3.cpp @@ -25,7 +25,11 @@ namespace libcamera { LOG_DEFINE_CATEGORY(IPAIPU3) -class IPAIPU3 : public ipa::ipu3::IPAIPU3Interface +namespace ipa { + +namespace ipu3 { + +class IPAIPU3 : public IPAIPU3Interface { public: int init([[maybe_unused]] const IPASettings &settings) override @@ -40,7 +44,7 @@ public: void mapBuffers(const std::vector &buffers) override; void unmapBuffers(const std::vector &ids) override; - void processEvent(const ipa::ipu3::IPU3Event &event) override; + void processEvent(const IPU3Event &event) override; private: void processControls(unsigned int frame, const ControlList &controls); @@ -119,14 +123,14 @@ void IPAIPU3::unmapBuffers(const std::vector &ids) } } -void IPAIPU3::processEvent(const ipa::ipu3::IPU3Event &event) +void IPAIPU3::processEvent(const IPU3Event &event) { switch (event.op) { - case ipa::ipu3::EventProcessControls: { + case EventProcessControls: { processControls(event.frame, event.controls); break; } - case ipa::ipu3::EventStatReady: { + case EventStatReady: { auto it = buffers_.find(event.bufferId); if (it == buffers_.end()) { LOG(IPAIPU3, Error) << "Could not find stats buffer!"; @@ -140,7 +144,7 @@ void IPAIPU3::processEvent(const ipa::ipu3::IPU3Event &event) parseStatistics(event.frame, stats); break; } - case ipa::ipu3::EventFillParams: { + case EventFillParams: { auto it = buffers_.find(event.bufferId); if (it == buffers_.end()) { LOG(IPAIPU3, Error) << "Could not find param buffer!"; @@ -173,8 +177,8 @@ void IPAIPU3::fillParams(unsigned int frame, ipu3_uapi_params *params) /* \todo Fill in parameters buffer. */ - ipa::ipu3::IPU3Action op; - op.op = ipa::ipu3::ActionParamFilled; + IPU3Action op; + op.op = ActionParamFilled; queueFrameAction.emit(frame, op); } @@ -187,8 +191,8 @@ void IPAIPU3::parseStatistics(unsigned int frame, /* \todo React to statistics and update internal state machine. */ /* \todo Add meta-data information to ctrls. */ - ipa::ipu3::IPU3Action op; - op.op = ipa::ipu3::ActionMetadataReady; + IPU3Action op; + op.op = ActionMetadataReady; op.controls = ctrls; queueFrameAction.emit(frame, op); @@ -196,8 +200,8 @@ void IPAIPU3::parseStatistics(unsigned int frame, void IPAIPU3::setControls(unsigned int frame) { - ipa::ipu3::IPU3Action op; - op.op = ipa::ipu3::ActionSetSensorControls; + IPU3Action op; + op.op = ActionSetSensorControls; ControlList ctrls(ctrls_); ctrls.set(V4L2_CID_EXPOSURE, static_cast(exposure_)); @@ -207,6 +211,10 @@ void IPAIPU3::setControls(unsigned int frame) queueFrameAction.emit(frame, op); } +} /* namespace ipu3 */ + +} /* namespace ipa */ + /* * External IPA module interface */ @@ -221,7 +229,7 @@ const struct IPAModuleInfo ipaModuleInfo = { IPAInterface *ipaCreate() { - return new IPAIPU3(); + return new ipa::ipu3::IPAIPU3(); } }