{"id":21150,"url":"https://patchwork.libcamera.org/api/1.1/patches/21150/?format=json","web_url":"https://patchwork.libcamera.org/patch/21150/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/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":"<20240902221317.19005-2-laurent.pinchart@ideasonboard.com>","date":"2024-09-02T22:13:17","name":"[2/2] libcamera: ipa: Drop unneded includes from ipa_interface.h","commit_ref":"b318101ada9ccd2c8b53b8c7a1436e84fc157e04","pull_url":null,"state":"accepted","archived":false,"hash":"5f7f6f60062b4859bcda774db64e942c240d06fd","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/1.1/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/21150/mbox/","series":[{"id":4557,"url":"https://patchwork.libcamera.org/api/1.1/series/4557/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=4557","date":"2024-09-02T22:13:16","name":"[1/2] utils: ipc: Include <string> in generated headers where needed","version":1,"mbox":"https://patchwork.libcamera.org/series/4557/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/21150/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/21150/checks/","tags":{},"headers":{"Return-Path":"<libcamera-devel-bounces@lists.libcamera.org>","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 88689C324C\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon,  2 Sep 2024 22:13:55 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 63B37634E7;\n\tTue,  3 Sep 2024 00:13:54 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id E193F63466\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue,  3 Sep 2024 00:13:51 +0200 (CEST)","from pendragon.ideasonboard.com (81-175-209-231.bb.dnainternet.fi\n\t[81.175.209.231])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 6034D51B;\n\tTue,  3 Sep 2024 00:12:40 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"RK3U+gve\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1725315160;\n\tbh=dutM9cqWogZLWEDoG1SapEYTQjhyvGKKgs8X+sbmDYM=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=RK3U+gvevyN2wwm5YNkjj3SftdzgSsDZUsweUdUWHDhj2UlFki5GH64/Imzq7ckB+\n\tGdp+o33TXnfeQqPORqQjeUqpGZqTna0pv7k9Pt76WaWS4j7rSjINSdj+tpVrMtpv8i\n\tgCgkr2nCJvzuD8/EmyZpD8HLPmkX1aeA8v0qP4Ok=","From":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>","To":"libcamera-devel@lists.libcamera.org","Cc":"Paul Elder <paul.elder@ideasonboard.com>,\n\tMilan Zamazal <mzamazal@redhat.com>","Subject":"[PATCH 2/2] libcamera: ipa: Drop unneded includes from\n\tipa_interface.h","Date":"Tue,  3 Sep 2024 01:13:17 +0300","Message-ID":"<20240902221317.19005-2-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.44.2","In-Reply-To":"<20240902221317.19005-1-laurent.pinchart@ideasonboard.com>","References":"<20240902221317.19005-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","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>","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"},"content":"The ipa_interface.h file includes a number of headers that are not\ndirectly used. Remove them, and add them to the source files that\ninclude ipa_interface.h as required.\n\nSigned-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n include/libcamera/ipa/ipa_interface.h                      | 7 -------\n src/ipa/ipu3/ipu3.cpp                                      | 2 ++\n src/ipa/rkisp1/rkisp1.cpp                                  | 1 +\n src/ipa/vimc/vimc.cpp                                      | 1 +\n src/libcamera/pipeline/vimc/vimc.cpp                       | 3 +++\n .../libcamera_templates/core_ipa_interface.h.tmpl          | 4 ++++\n .../libcamera_templates/module_ipa_interface.h.tmpl        | 7 +++++++\n 7 files changed, 18 insertions(+), 7 deletions(-)","diff":"diff --git a/include/libcamera/ipa/ipa_interface.h b/include/libcamera/ipa/ipa_interface.h\nindex 2fdc085e771f..dce9637a2238 100644\n--- a/include/libcamera/ipa/ipa_interface.h\n+++ b/include/libcamera/ipa/ipa_interface.h\n@@ -7,13 +7,6 @@\n \n #pragma once\n \n-#include <libcamera/base/flags.h>\n-#include <libcamera/base/signal.h>\n-\n-#include <libcamera/controls.h>\n-#include <libcamera/framebuffer.h>\n-#include <libcamera/geometry.h>\n-\n namespace libcamera {\n \n /*\ndiff --git a/src/ipa/ipu3/ipu3.cpp b/src/ipa/ipu3/ipu3.cpp\nindex 6ebf7c1dcab4..10a8c86d8e64 100644\n--- a/src/ipa/ipu3/ipu3.cpp\n+++ b/src/ipa/ipu3/ipu3.cpp\n@@ -23,7 +23,9 @@\n #include <libcamera/base/utils.h>\n \n #include <libcamera/control_ids.h>\n+#include <libcamera/controls.h>\n #include <libcamera/framebuffer.h>\n+#include <libcamera/geometry.h>\n #include <libcamera/request.h>\n \n #include <libcamera/ipa/ipa_interface.h>\ndiff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp\nindex f164d7c51ccf..78d2c375d6dc 100644\n--- a/src/ipa/rkisp1/rkisp1.cpp\n+++ b/src/ipa/rkisp1/rkisp1.cpp\n@@ -18,6 +18,7 @@\n #include <libcamera/base/log.h>\n \n #include <libcamera/control_ids.h>\n+#include <libcamera/controls.h>\n #include <libcamera/framebuffer.h>\n #include <libcamera/request.h>\n \ndiff --git a/src/ipa/vimc/vimc.cpp b/src/ipa/vimc/vimc.cpp\nindex ebd63fa6cc09..5495401f1731 100644\n--- a/src/ipa/vimc/vimc.cpp\n+++ b/src/ipa/vimc/vimc.cpp\n@@ -14,6 +14,7 @@\n #include <iostream>\n \n #include <libcamera/base/file.h>\n+#include <libcamera/base/flags.h>\n #include <libcamera/base/log.h>\n \n #include <libcamera/ipa/ipa_interface.h>\ndiff --git a/src/libcamera/pipeline/vimc/vimc.cpp b/src/libcamera/pipeline/vimc/vimc.cpp\nindex 0ec9928eec23..325174b90087 100644\n--- a/src/libcamera/pipeline/vimc/vimc.cpp\n+++ b/src/libcamera/pipeline/vimc/vimc.cpp\n@@ -14,6 +14,7 @@\n #include <linux/media-bus-format.h>\n #include <linux/version.h>\n \n+#include <libcamera/base/flags.h>\n #include <libcamera/base/log.h>\n #include <libcamera/base/utils.h>\n \n@@ -21,6 +22,8 @@\n #include <libcamera/control_ids.h>\n #include <libcamera/controls.h>\n #include <libcamera/formats.h>\n+#include <libcamera/framebuffer.h>\n+#include <libcamera/geometry.h>\n #include <libcamera/request.h>\n #include <libcamera/stream.h>\n \ndiff --git a/utils/codegen/ipc/generators/libcamera_templates/core_ipa_interface.h.tmpl b/utils/codegen/ipc/generators/libcamera_templates/core_ipa_interface.h.tmpl\nindex 590135b88421..3942e5708d98 100644\n--- a/utils/codegen/ipc/generators/libcamera_templates/core_ipa_interface.h.tmpl\n+++ b/utils/codegen/ipc/generators/libcamera_templates/core_ipa_interface.h.tmpl\n@@ -18,6 +18,10 @@\n {% if has_string %}#include <string>{% endif %}\n {% if has_array %}#include <vector>{% endif %}\n \n+#include <libcamera/controls.h>\n+#include <libcamera/framebuffer.h>\n+#include <libcamera/geometry.h>\n+\n #include <libcamera/ipa/ipa_interface.h>\n \n namespace libcamera {\ndiff --git a/utils/codegen/ipc/generators/libcamera_templates/module_ipa_interface.h.tmpl b/utils/codegen/ipc/generators/libcamera_templates/module_ipa_interface.h.tmpl\nindex 0111d0c4c591..5d70ea6a2c29 100644\n--- a/utils/codegen/ipc/generators/libcamera_templates/module_ipa_interface.h.tmpl\n+++ b/utils/codegen/ipc/generators/libcamera_templates/module_ipa_interface.h.tmpl\n@@ -18,6 +18,13 @@\n {% if has_string %}#include <string>{% endif %}\n {% if has_array %}#include <vector>{% endif %}\n \n+#include <libcamera/base/flags.h>\n+#include <libcamera/base/signal.h>\n+\n+#include <libcamera/controls.h>\n+#include <libcamera/framebuffer.h>\n+#include <libcamera/geometry.h>\n+\n #include <libcamera/ipa/core_ipa_interface.h>\n #include <libcamera/ipa/ipa_interface.h>\n \n","prefixes":["2/2"]}