{"id":13329,"url":"https://patchwork.libcamera.org/api/patches/13329/?format=json","web_url":"https://patchwork.libcamera.org/patch/13329/","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":"<20210812165243.276977-2-jeanmichel.hautbois@ideasonboard.com>","date":"2021-08-12T16:52:34","name":"[libcamera-devel,v2,01/10] ipa: move libipa::Algorithm to ipa/ipu3/algorithms","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"463fc77bd3785dc40bd6711d587bd1cfa81211fd","submitter":{"id":75,"url":"https://patchwork.libcamera.org/api/people/75/?format=json","name":"Jean-Michel Hautbois","email":"jeanmichel.hautbois@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/13329/mbox/","series":[{"id":2347,"url":"https://patchwork.libcamera.org/api/series/2347/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2347","date":"2021-08-12T16:52:33","name":"IPU3: Introduce modularity for algorithms","version":2,"mbox":"https://patchwork.libcamera.org/series/2347/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/13329/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/13329/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 CF9E0BD87D\n\tfor ;\n\tThu, 12 Aug 2021 16:52:50 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 525BB68895;\n\tThu, 12 Aug 2021 18:52:50 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 0AD2068864\n\tfor ;\n\tThu, 12 Aug 2021 18:52:47 +0200 (CEST)","from tatooine.ideasonboard.com (unknown\n\t[IPv6:2a01:e0a:169:7140:3d6d:7284:3c48:5edc])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id B1A7C8AF;\n\tThu, 12 Aug 2021 18:52:46 +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=\"Fl2SLGi1\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1628787166;\n\tbh=sm1EjPl+Zv8p29ut3Vxwz46WKyBblz+42Osld8w3hCM=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=Fl2SLGi1d1+c9VGPEk1Kfgtb6fjA2CzqabvFcgcCyOBgMJZUz/vHP/6Idowk1e4lR\n\tk4GZs83r/l9V1E4y7WsiEc8Zh8FFejuK6LeMrN9CSHRDkPeZ1pUJSceUy0UaQ8K7OD\n\t/9J5V1Fq/Igk4NM8Ckp0gALp7Y/tetsZ+LxS/20o=","From":"Jean-Michel Hautbois ","To":"libcamera-devel@lists.libcamera.org","Date":"Thu, 12 Aug 2021 18:52:34 +0200","Message-Id":"<20210812165243.276977-2-jeanmichel.hautbois@ideasonboard.com>","X-Mailer":"git-send-email 2.30.2","In-Reply-To":"<20210812165243.276977-1-jeanmichel.hautbois@ideasonboard.com>","References":"<20210812165243.276977-1-jeanmichel.hautbois@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v2 01/10] ipa: move libipa::Algorithm to\n\tipa/ipu3/algorithms","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","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"The abstract Algorithm class was originally placed in libipa as an attempt to\ndefine a generic algorithm container.\nThis was a little optimistic and pushed a bit far too early.\n\nMove the Algorithm class into the IPU3 which is the only user of the class,\nas we adapt it to support modular algorithm components for the IPU3.\n\nSigned-off-by: Jean-Michel Hautbois \nReviewed-by: Kieran Bingham kieran.bingham@ideasonboard.com\n---\n src/ipa/ipu3/algorithms/algorithm.h | 24 ++++++++++++++++++\n src/ipa/ipu3/algorithms/meson.build | 4 +++\n src/ipa/ipu3/ipu3_agc.h | 2 +-\n src/ipa/ipu3/ipu3_awb.h | 2 +-\n src/ipa/ipu3/meson.build | 4 +++\n src/ipa/libipa/algorithm.cpp | 39 -----------------------------\n src/ipa/libipa/algorithm.h | 24 ------------------\n src/ipa/libipa/meson.build | 2 --\n 8 files changed, 34 insertions(+), 67 deletions(-)\n create mode 100644 src/ipa/ipu3/algorithms/algorithm.h\n create mode 100644 src/ipa/ipu3/algorithms/meson.build\n delete mode 100644 src/ipa/libipa/algorithm.cpp\n delete mode 100644 src/ipa/libipa/algorithm.h","diff":"diff --git a/src/ipa/ipu3/algorithms/algorithm.h b/src/ipa/ipu3/algorithms/algorithm.h\nnew file mode 100644\nindex 00000000..072f01c4\n--- /dev/null\n+++ b/src/ipa/ipu3/algorithms/algorithm.h\n@@ -0,0 +1,24 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2021, Ideas On Board\n+ *\n+ * algorithm.h - IPU3 control algorithm interface\n+ */\n+#ifndef __LIBCAMERA_IPA_IPU3_ALGORITHM_H__\n+#define __LIBCAMERA_IPA_IPU3_ALGORITHM_H__\n+\n+namespace libcamera {\n+\n+namespace ipa::ipu3 {\n+\n+class Algorithm\n+{\n+public:\n+\tvirtual ~Algorithm() {}\n+};\n+\n+} /* namespace ipa::ipu3 */\n+\n+} /* namespace libcamera */\n+\n+#endif /* __LIBCAMERA_IPA_IPU3_ALGORITHM_H__ */\ndiff --git a/src/ipa/ipu3/algorithms/meson.build b/src/ipa/ipu3/algorithms/meson.build\nnew file mode 100644\nindex 00000000..67148333\n--- /dev/null\n+++ b/src/ipa/ipu3/algorithms/meson.build\n@@ -0,0 +1,4 @@\n+# SPDX-License-Identifier: CC0-1.0\n+\n+ipu3_ipa_algorithms = files([\n+])\ndiff --git a/src/ipa/ipu3/ipu3_agc.h b/src/ipa/ipu3/ipu3_agc.h\nindex 9f3d4257..f00b98d6 100644\n--- a/src/ipa/ipu3/ipu3_agc.h\n+++ b/src/ipa/ipu3/ipu3_agc.h\n@@ -13,7 +13,7 @@\n \n #include \n \n-#include \"libipa/algorithm.h\"\n+#include \"algorithms/algorithm.h\"\n \n namespace libcamera {\n \ndiff --git a/src/ipa/ipu3/ipu3_awb.h b/src/ipa/ipu3/ipu3_awb.h\nindex 122cf68c..ea2d4320 100644\n--- a/src/ipa/ipu3/ipu3_awb.h\n+++ b/src/ipa/ipu3/ipu3_awb.h\n@@ -13,7 +13,7 @@\n \n #include \n \n-#include \"libipa/algorithm.h\"\n+#include \"algorithms/algorithm.h\"\n \n namespace libcamera {\n \ndiff --git a/src/ipa/ipu3/meson.build b/src/ipa/ipu3/meson.build\nindex b6364190..fcb27d68 100644\n--- a/src/ipa/ipu3/meson.build\n+++ b/src/ipa/ipu3/meson.build\n@@ -1,5 +1,7 @@\n # SPDX-License-Identifier: CC0-1.0\n \n+subdir('algorithms')\n+\n ipa_name = 'ipa_ipu3'\n \n ipu3_ipa_sources = files([\n@@ -8,6 +10,8 @@ ipu3_ipa_sources = files([\n 'ipu3_awb.cpp',\n ])\n \n+ipu3_ipa_sources += ipu3_ipa_algorithms\n+\n mod = shared_module(ipa_name,\n [ipu3_ipa_sources, libcamera_generated_ipa_headers],\n name_prefix : '',\ndiff --git a/src/ipa/libipa/algorithm.cpp b/src/ipa/libipa/algorithm.cpp\ndeleted file mode 100644\nindex 930f9353..00000000\n--- a/src/ipa/libipa/algorithm.cpp\n+++ /dev/null\n@@ -1,39 +0,0 @@\n-/* SPDX-License-Identifier: LGPL-2.1-or-later */\n-/*\n- * Copyright (C) 2021, Ideas On Board\n- *\n- * algorithm.cpp - ISP control algorithms\n- */\n-\n-#include \"algorithm.h\"\n-\n-/**\n- * \\file algorithm.h\n- * \\brief Algorithm common interface\n- */\n-\n-namespace libcamera {\n-\n-/**\n- * \\brief The IPA namespace\n- *\n- * The IPA namespace groups all types specific to IPA modules. It serves as the\n- * top-level namespace for the IPA library libipa, and also contains\n- * module-specific namespaces for IPA modules.\n- */\n-namespace ipa {\n-\n-/**\n- * \\class Algorithm\n- * \\brief The base class for all IPA algorithms\n- *\n- * The Algorithm class defines a standard interface for IPA algorithms. By\n- * abstracting algorithms, it makes possible the implementation of generic code\n- * to manage algorithms regardless of their specific type.\n- */\n-\n-Algorithm::~Algorithm() = default;\n-\n-} /* namespace ipa */\n-\n-} /* namespace libcamera */\ndiff --git a/src/ipa/libipa/algorithm.h b/src/ipa/libipa/algorithm.h\ndeleted file mode 100644\nindex 89cee4c4..00000000\n--- a/src/ipa/libipa/algorithm.h\n+++ /dev/null\n@@ -1,24 +0,0 @@\n-/* SPDX-License-Identifier: LGPL-2.1-or-later */\n-/*\n- * Copyright (C) 2021, Ideas On Board\n- *\n- * algorithm.h - ISP control algorithm interface\n- */\n-#ifndef __LIBCAMERA_IPA_LIBIPA_ALGORITHM_H__\n-#define __LIBCAMERA_IPA_LIBIPA_ALGORITHM_H__\n-\n-namespace libcamera {\n-\n-namespace ipa {\n-\n-class Algorithm\n-{\n-public:\n-\tvirtual ~Algorithm();\n-};\n-\n-} /* namespace ipa */\n-\n-} /* namespace libcamera */\n-\n-#endif /* __LIBCAMERA_IPA_LIBIPA_ALGORITHM_H__ */\ndiff --git a/src/ipa/libipa/meson.build b/src/ipa/libipa/meson.build\nindex 3fda7c00..2a694b1e 100644\n--- a/src/ipa/libipa/meson.build\n+++ b/src/ipa/libipa/meson.build\n@@ -1,13 +1,11 @@\n # SPDX-License-Identifier: CC0-1.0\n \n libipa_headers = files([\n- 'algorithm.h',\n 'camera_sensor_helper.h',\n 'histogram.h'\n ])\n \n libipa_sources = files([\n- 'algorithm.cpp',\n 'camera_sensor_helper.cpp',\n 'histogram.cpp'\n ])\n","prefixes":["libcamera-devel","v2","01/10"]}