{"id":3937,"url":"https://patchwork.libcamera.org/api/patches/3937/?format=json","web_url":"https://patchwork.libcamera.org/patch/3937/","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":"<20200605090106.15424-3-paul.elder@ideasonboard.com>","date":"2020-06-05T09:01:01","name":"[libcamera-devel,v2,2/7] IPAManager: remove instance() and make createIPA() static","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"e15f0a0a6ca94fa08073e54289024ab66850688b","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/3937/mbox/","series":[{"id":956,"url":"https://patchwork.libcamera.org/api/series/956/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=956","date":"2020-06-05T09:00:59","name":"Support qv4l2 with v4l2-compat","version":2,"mbox":"https://patchwork.libcamera.org/series/956/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/3937/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/3937/checks/","tags":{},"headers":{"Return-Path":"","Received":["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 5AAFB61375\n\tfor ;\n\tFri, 5 Jun 2020 11:01:19 +0200 (CEST)","from emerald.amanokami.net (fs76eef344.knge213.ap.nuro.jp\n\t[118.238.243.68])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 2480327C;\n\tFri, 5 Jun 2020 11:01:17 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"AqUswxUR\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1591347679;\n\tbh=yylEpV+peh6zKRxo/3lJOgX0clLhFV5SY/1JmZdufnQ=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=AqUswxURYp9Z0Cj3ZVOmUOItzZjuLwoMCBnY06mKWrGX+WI3EIbunzmwrd1gwU6TY\n\t/5QSR3mr7EnfXk8DSppGANU0AWLnaG8wkgje2GqIlcvWGr5AVtGxoRNFYOZPLHHXYT\n\tP4pXZByPmb8riHQxu/8GTUegS3Bmsm8V3ti34cH4=","From":"Paul Elder ","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 5 Jun 2020 18:01:01 +0900","Message-Id":"<20200605090106.15424-3-paul.elder@ideasonboard.com>","X-Mailer":"git-send-email 2.20.1","In-Reply-To":"<20200605090106.15424-1-paul.elder@ideasonboard.com>","References":"<20200605090106.15424-1-paul.elder@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v2 2/7] IPAManager: remove instance() and\n\tmake createIPA() static","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","X-List-Received-Date":"Fri, 05 Jun 2020 09:01:19 -0000"},"content":"As the only usage of IPAManager::instance() is by the pipeline handlers\nto call IPAManager::createIPA(), remove the former and make the latter\nstatic. Update the pipeline handlers and tests accordingly.\n\nSigned-off-by: Paul Elder \n\n---\nNew in v2\n---\n include/libcamera/internal/ipa_manager.h | 8 +++-----\n src/libcamera/ipa_manager.cpp | 18 ++----------------\n .../pipeline/raspberrypi/raspberrypi.cpp | 2 +-\n src/libcamera/pipeline/rkisp1/rkisp1.cpp | 2 +-\n src/libcamera/pipeline/vimc/vimc.cpp | 2 +-\n test/ipa/ipa_interface_test.cpp | 2 +-\n 6 files changed, 9 insertions(+), 25 deletions(-)","diff":"diff --git a/include/libcamera/internal/ipa_manager.h b/include/libcamera/internal/ipa_manager.h\nindex 43f700d3..05643e5e 100644\n--- a/include/libcamera/internal/ipa_manager.h\n+++ b/include/libcamera/internal/ipa_manager.h\n@@ -25,11 +25,9 @@ public:\n \tIPAManager();\n \t~IPAManager();\n \n-\tstatic IPAManager *instance();\n-\n-\tstd::unique_ptr createIPA(PipelineHandler *pipe,\n-\t\t\t\t\t uint32_t maxVersion,\n-\t\t\t\t\t uint32_t minVersion);\n+\tstatic std::unique_ptr createIPA(PipelineHandler *pipe,\n+\t\t\t\t\t\t uint32_t maxVersion,\n+\t\t\t\t\t\t uint32_t minVersion);\n \n private:\n \tstatic IPAManager *self_;\ndiff --git a/src/libcamera/ipa_manager.cpp b/src/libcamera/ipa_manager.cpp\nindex abb681a3..9d0c2069 100644\n--- a/src/libcamera/ipa_manager.cpp\n+++ b/src/libcamera/ipa_manager.cpp\n@@ -159,20 +159,6 @@ IPAManager::~IPAManager()\n \tself_ = nullptr;\n }\n \n-/**\n- * \\brief Retrieve the IPA manager instance\n- *\n- * The IPAManager is a singleton and can't be constructed manually. This\n- * function shall instead be used to retrieve the single global instance of the\n- * manager.\n- *\n- * \\return The IPA manager instance\n- */\n-IPAManager *IPAManager::instance()\n-{\n-\treturn self_;\n-}\n-\n /**\n * \\brief Identify shared library objects within a directory\n * \\param[in] libDir The directory to search for shared objects\n@@ -274,7 +260,7 @@ std::unique_ptr IPAManager::createIPA(PipelineHandler *pipe,\n {\n \tIPAModule *m = nullptr;\n \n-\tfor (IPAModule *module : modules_) {\n+\tfor (IPAModule *module : self_->modules_) {\n \t\tif (module->match(pipe, minVersion, maxVersion)) {\n \t\t\tm = module;\n \t\t\tbreak;\n@@ -290,7 +276,7 @@ std::unique_ptr IPAManager::createIPA(PipelineHandler *pipe,\n \t *\n \t * \\todo Implement a better proxy selection\n \t */\n-\tconst char *proxyName = isSignatureValid(m)\n+\tconst char *proxyName = self_->isSignatureValid(m)\n \t\t\t ? \"IPAProxyThread\" : \"IPAProxyLinux\";\n \tIPAProxyFactory *pf = nullptr;\n \ndiff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\nindex e16a9c7f..b9b88506 100644\n--- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n+++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n@@ -1118,7 +1118,7 @@ void RPiCameraData::frameStarted(uint32_t sequence)\n \n int RPiCameraData::loadIPA()\n {\n-\tipa_ = IPAManager::instance()->createIPA(pipe_, 1, 1);\n+\tipa_ = IPAManager::createIPA(pipe_, 1, 1);\n \tif (!ipa_)\n \t\treturn -ENOENT;\n \ndiff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\nindex d807fc2c..900f873a 100644\n--- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n+++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp\n@@ -395,7 +395,7 @@ private:\n \n int RkISP1CameraData::loadIPA()\n {\n-\tipa_ = IPAManager::instance()->createIPA(pipe_, 1, 1);\n+\tipa_ = IPAManager::createIPA(pipe_, 1, 1);\n \tif (!ipa_)\n \t\treturn -ENOENT;\n \ndiff --git a/src/libcamera/pipeline/vimc/vimc.cpp b/src/libcamera/pipeline/vimc/vimc.cpp\nindex ba9fca50..3881545b 100644\n--- a/src/libcamera/pipeline/vimc/vimc.cpp\n+++ b/src/libcamera/pipeline/vimc/vimc.cpp\n@@ -410,7 +410,7 @@ bool PipelineHandlerVimc::match(DeviceEnumerator *enumerator)\n \n \tstd::unique_ptr data = std::make_unique(this, media);\n \n-\tdata->ipa_ = IPAManager::instance()->createIPA(this, 0, 0);\n+\tdata->ipa_ = IPAManager::createIPA(this, 0, 0);\n \tif (data->ipa_ != nullptr) {\n \t\tstd::string conf = data->ipa_->configurationFile(\"vimc.conf\");\n \t\tdata->ipa_->init(IPASettings{ conf });\ndiff --git a/test/ipa/ipa_interface_test.cpp b/test/ipa/ipa_interface_test.cpp\nindex 153493ba..1bc93a63 100644\n--- a/test/ipa/ipa_interface_test.cpp\n+++ b/test/ipa/ipa_interface_test.cpp\n@@ -95,7 +95,7 @@ protected:\n \t\tEventDispatcher *dispatcher = thread()->eventDispatcher();\n \t\tTimer timer;\n \n-\t\tipa_ = IPAManager::instance()->createIPA(pipe_.get(), 0, 0);\n+\t\tipa_ = IPAManager::createIPA(pipe_.get(), 0, 0);\n \t\tif (!ipa_) {\n \t\t\tcerr << \"Failed to create VIMC IPA interface\" << endl;\n \t\t\treturn TestFail;\n","prefixes":["libcamera-devel","v2","2/7"]}