{"id":3558,"url":"https://patchwork.libcamera.org/api/patches/3558/?format=json","web_url":"https://patchwork.libcamera.org/patch/3558/","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":"<20200427031713.14013-7-laurent.pinchart@ideasonboard.com>","date":"2020-04-27T03:17:08","name":"[libcamera-devel,06/11] libcamera: ipa_manager: Return an IPAProxy from createIPA()","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"5bed70f87d531edf12a8a67c3fc478793e885dce","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/3558/mbox/","series":[{"id":831,"url":"https://patchwork.libcamera.org/api/series/831/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=831","date":"2020-04-27T03:17:02","name":"libcamera: Add support for IPA configuration","version":1,"mbox":"https://patchwork.libcamera.org/series/831/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/3558/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/3558/checks/","tags":{},"headers":{"Return-Path":"<laurent.pinchart@ideasonboard.com>","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 2496C60AF4\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 27 Apr 2020 05:17:35 +0200 (CEST)","from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi\n\t[81.175.216.236])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id B185397D\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 27 Apr 2020 05:17:34 +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=\"Q4UAEiQG\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1587957454;\n\tbh=MjnLqgId78kIcnx1x19FR35PMzeYX8YVfyOVjuYPVFk=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=Q4UAEiQG1IcVbchc8g4VJVQpgJxULjGB0kJUj6FJovRxl1hCwQfoPFkPJUhRoR7L7\n\t89YAPRGot13kpZsy9iQBJgXF8jYYUn8eMrssMU10l3VYh0fQBn+BJocaAGm1WulQEf\n\tpUSHisPp9bOero+ALetwUXixanRUdTs9/QIcKmX0=","From":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 27 Apr 2020 06:17:08 +0300","Message-Id":"<20200427031713.14013-7-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.25.3","In-Reply-To":"<20200427031713.14013-1-laurent.pinchart@ideasonboard.com>","References":"<20200427031713.14013-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 06/11] libcamera: ipa_manager: Return an\n\tIPAProxy from createIPA()","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"<libcamera-devel.lists.libcamera.org>","List-Unsubscribe":"<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>","List-Archive":"<https://lists.libcamera.org/pipermail/libcamera-devel/>","List-Post":"<mailto:libcamera-devel@lists.libcamera.org>","List-Help":"<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>","List-Subscribe":"<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>","X-List-Received-Date":"Mon, 27 Apr 2020 03:17:36 -0000"},"content":"In order to provide pipeline handlers with IPA-related helpers on top of\nIPAInterface, return the IPAProxy instance from IPAManager::createIPA().\nNo change is required in the pipeline handlers as the IPAInterface that\nwas previously returned is implemented by an IPAProxy instance already.\n\nSigned-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n src/libcamera/include/ipa_manager.h      |  6 +++---\n src/libcamera/include/pipeline_handler.h |  5 +++--\n src/libcamera/ipa_manager.cpp            | 14 +++++++-------\n 3 files changed, 13 insertions(+), 12 deletions(-)","diff":"diff --git a/src/libcamera/include/ipa_manager.h b/src/libcamera/include/ipa_manager.h\nindex 6165efb8b145..aa6b9adb1f87 100644\n--- a/src/libcamera/include/ipa_manager.h\n+++ b/src/libcamera/include/ipa_manager.h\n@@ -24,9 +24,9 @@ class IPAManager\n public:\n \tstatic IPAManager *instance();\n \n-\tstd::unique_ptr<IPAInterface> createIPA(PipelineHandler *pipe,\n-\t\t\t\t\t\tuint32_t maxVersion,\n-\t\t\t\t\t\tuint32_t minVersion);\n+\tstd::unique_ptr<IPAProxy> createIPA(PipelineHandler *pipe,\n+\t\t\t\t\t    uint32_t maxVersion,\n+\t\t\t\t\t    uint32_t minVersion);\n \n private:\n \tstd::vector<IPAModule *> modules_;\ndiff --git a/src/libcamera/include/pipeline_handler.h b/src/libcamera/include/pipeline_handler.h\nindex 3fcfeda4bfee..706413fa6e9f 100644\n--- a/src/libcamera/include/pipeline_handler.h\n+++ b/src/libcamera/include/pipeline_handler.h\n@@ -15,11 +15,12 @@\n #include <sys/types.h>\n #include <vector>\n \n-#include <ipa/ipa_interface.h>\n #include <libcamera/controls.h>\n #include <libcamera/object.h>\n #include <libcamera/stream.h>\n \n+#include \"ipa_proxy.h\"\n+\n namespace libcamera {\n \n class Camera;\n@@ -46,7 +47,7 @@ public:\n \tstd::list<Request *> queuedRequests_;\n \tControlInfoMap controlInfo_;\n \tControlList properties_;\n-\tstd::unique_ptr<IPAInterface> ipa_;\n+\tstd::unique_ptr<IPAProxy> ipa_;\n \n private:\n \tCameraData(const CameraData &) = delete;\ndiff --git a/src/libcamera/ipa_manager.cpp b/src/libcamera/ipa_manager.cpp\nindex 50b6792d6cce..df3786797010 100644\n--- a/src/libcamera/ipa_manager.cpp\n+++ b/src/libcamera/ipa_manager.cpp\n@@ -247,17 +247,17 @@ unsigned int IPAManager::addDir(const char *libDir, unsigned int maxDepth)\n }\n \n /**\n- * \\brief Create an IPA interface that matches a given pipeline handler\n- * \\param[in] pipe The pipeline handler that wants a matching IPA interface\n+ * \\brief Create an IPA proxy that matches a given pipeline handler\n+ * \\param[in] pipe The pipeline handler that wants a matching IPA proxy\n  * \\param[in] minVersion Minimum acceptable version of IPA module\n  * \\param[in] maxVersion Maximum acceptable version of IPA module\n  *\n- * \\return A newly created IPA interface, or nullptr if no matching\n- * IPA module is found or if the IPA interface fails to initialize\n+ * \\return A newly created IPA proxy, or nullptr if no matching IPA module is\n+ * found or if the IPA proxy fails to initialize\n  */\n-std::unique_ptr<IPAInterface> IPAManager::createIPA(PipelineHandler *pipe,\n-\t\t\t\t\t\t    uint32_t maxVersion,\n-\t\t\t\t\t\t    uint32_t minVersion)\n+std::unique_ptr<IPAProxy> IPAManager::createIPA(PipelineHandler *pipe,\n+\t\t\t\t\t\tuint32_t maxVersion,\n+\t\t\t\t\t\tuint32_t minVersion)\n {\n \tIPAModule *m = nullptr;\n \n","prefixes":["libcamera-devel","06/11"]}