From patchwork Tue Sep 24 17:24:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jacopo Mondi X-Patchwork-Id: 2015 Return-Path: Received: from relay3-d.mail.gandi.net (relay3-d.mail.gandi.net [217.70.183.195]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 9A10762378 for ; Tue, 24 Sep 2019 19:23:38 +0200 (CEST) X-Originating-IP: 213.45.248.89 Received: from uno.homenet.telecomitalia.it (host89-248-dynamic.45-213-r.retail.telecomitalia.it [213.45.248.89]) (Authenticated sender: jacopo@jmondi.org) by relay3-d.mail.gandi.net (Postfix) with ESMTPSA id 42B0560006 for ; Tue, 24 Sep 2019 17:23:38 +0000 (UTC) From: Jacopo Mondi To: libcamera-devel@lists.libcamera.org Date: Tue, 24 Sep 2019 19:24:58 +0200 Message-Id: <20190924172503.30864-17-jacopo@jmondi.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190924172503.30864-1-jacopo@jmondi.org> References: <20190924172503.30864-1-jacopo@jmondi.org> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 16/21] ipa: Remove IPAInterface::init() 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: , X-List-Received-Date: Tue, 24 Sep 2019 17:23:39 -0000 From: Niklas Söderlund The function performs no useful task and will not be needed when we extend the IPA interface to process parameter and statistic buffers. Reviewed-by: Jacopo Mondi Signed-off-by: Niklas Söderlund [jacopo: Remove init() method in ipa_proxy_linux.cpp] Signed-off-by: Jacopo Mondi --- include/ipa/ipa_interface.h | 2 -- src/ipa/ipa_dummy.cpp | 10 ---------- src/libcamera/ipa_interface.cpp | 5 ----- src/libcamera/pipeline/vimc.cpp | 2 -- src/libcamera/proxy/ipa_proxy_linux.cpp | 9 --------- 5 files changed, 28 deletions(-) diff --git a/include/ipa/ipa_interface.h b/include/ipa/ipa_interface.h index 2c5eb1fd5243..9bbc4cf58ec6 100644 --- a/include/ipa/ipa_interface.h +++ b/include/ipa/ipa_interface.h @@ -13,8 +13,6 @@ class IPAInterface { public: virtual ~IPAInterface() {} - - virtual int init() = 0; }; } /* namespace libcamera */ diff --git a/src/ipa/ipa_dummy.cpp b/src/ipa/ipa_dummy.cpp index 9d0cbdc8b1ad..c833e5fb0b2d 100644 --- a/src/ipa/ipa_dummy.cpp +++ b/src/ipa/ipa_dummy.cpp @@ -5,8 +5,6 @@ * ipa_dummy.cpp - Dummy Image Processing Algorithm module */ -#include - #include #include @@ -14,16 +12,8 @@ namespace libcamera { class IPADummy : public IPAInterface { -public: - int init(); }; -int IPADummy::init() -{ - std::cout << "initializing dummy IPA!" << std::endl; - return 0; -} - /* * External IPA module interface */ diff --git a/src/libcamera/ipa_interface.cpp b/src/libcamera/ipa_interface.cpp index d7d8ca8881ef..f70d91ded1ab 100644 --- a/src/libcamera/ipa_interface.cpp +++ b/src/libcamera/ipa_interface.cpp @@ -19,9 +19,4 @@ namespace libcamera { * \brief Interface for IPA implementation */ -/** - * \fn IPAInterface::init() - * \brief Initialise the IPAInterface - */ - } /* namespace libcamera */ diff --git a/src/libcamera/pipeline/vimc.cpp b/src/libcamera/pipeline/vimc.cpp index 80a71f7cd5fd..499ce59181c5 100644 --- a/src/libcamera/pipeline/vimc.cpp +++ b/src/libcamera/pipeline/vimc.cpp @@ -364,8 +364,6 @@ bool PipelineHandlerVimc::match(DeviceEnumerator *enumerator) ipa_ = IPAManager::instance()->createIPA(this, 0, 0); if (ipa_ == nullptr) LOG(VIMC, Warning) << "no matching IPA found"; - else - ipa_->init(); std::unique_ptr data = utils::make_unique(this); diff --git a/src/libcamera/proxy/ipa_proxy_linux.cpp b/src/libcamera/proxy/ipa_proxy_linux.cpp index 62fcb529e1c7..c9eaedff0224 100644 --- a/src/libcamera/proxy/ipa_proxy_linux.cpp +++ b/src/libcamera/proxy/ipa_proxy_linux.cpp @@ -26,8 +26,6 @@ public: IPAProxyLinux(IPAModule *ipam); ~IPAProxyLinux(); - int init(); - private: void readyRead(IPCUnixSocket *ipc); @@ -36,13 +34,6 @@ private: IPCUnixSocket *socket_; }; -int IPAProxyLinux::init() -{ - LOG(IPAProxy, Debug) << "initializing IPA via dummy proxy!"; - - return 0; -} - IPAProxyLinux::IPAProxyLinux(IPAModule *ipam) : proc_(nullptr), socket_(nullptr) {