summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2019-09-14 22:47:28 +0300
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2019-09-15 13:57:08 +0300
commit1e704c84a946f988c290169f060aa088d53fc4a8 (patch)
treeeaeea3e6465ca1e04d6003e8bd14731e74645221 /src
parentcecfeed61e8bcb4b53c2ed8e1b26d8c8af38b8e3 (diff)
libcamera: Move ipa includes to the same level as libcamera
The ipa includes are located in include/libcamera/ipa/. This gives an incorrect impression that they are a sub-part of the rest of the libcamera API, while they are the API towards the IPA the same way that include/libcamera/ contains the API towards applications. To clarify this, move them to include/ipa/. The IPA headers are however still part of libcamera, so installing them to ${prefix}/include/ipa/ would make little sense. To fix this, move the application facing API to ${prefix}/include/libcamera/libcamera/ when installed, and the IPA to ${prefix}/include/libcamera/ipa/. When major versions of libcamera will be released, they could then be installed side by side in ${prefix}/include/libcamera-${version}/. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Diffstat (limited to 'src')
-rw-r--r--src/ipa/ipa_dummy.cpp4
-rw-r--r--src/ipa/ipa_dummy_isolate.cpp4
-rw-r--r--src/libcamera/include/ipa_manager.h4
-rw-r--r--src/libcamera/include/ipa_module.h4
-rw-r--r--src/libcamera/include/ipa_proxy.h2
-rw-r--r--src/libcamera/ipa_interface.cpp2
-rw-r--r--src/libcamera/meson.build2
-rw-r--r--src/libcamera/pipeline/vimc.cpp4
-rw-r--r--src/libcamera/proxy/ipa_proxy_linux.cpp4
-rw-r--r--src/libcamera/proxy/worker/ipa_proxy_linux_worker.cpp2
10 files changed, 16 insertions, 16 deletions
diff --git a/src/ipa/ipa_dummy.cpp b/src/ipa/ipa_dummy.cpp
index 4c8b6657..9313aabd 100644
--- a/src/ipa/ipa_dummy.cpp
+++ b/src/ipa/ipa_dummy.cpp
@@ -7,8 +7,8 @@
#include <iostream>
-#include <libcamera/ipa/ipa_interface.h>
-#include <libcamera/ipa/ipa_module_info.h>
+#include <ipa/ipa_interface.h>
+#include <ipa/ipa_module_info.h>
namespace libcamera {
diff --git a/src/ipa/ipa_dummy_isolate.cpp b/src/ipa/ipa_dummy_isolate.cpp
index 24434e85..cd66626d 100644
--- a/src/ipa/ipa_dummy_isolate.cpp
+++ b/src/ipa/ipa_dummy_isolate.cpp
@@ -8,8 +8,8 @@
#include <iostream>
-#include <libcamera/ipa/ipa_interface.h>
-#include <libcamera/ipa/ipa_module_info.h>
+#include <ipa/ipa_interface.h>
+#include <ipa/ipa_module_info.h>
namespace libcamera {
diff --git a/src/libcamera/include/ipa_manager.h b/src/libcamera/include/ipa_manager.h
index 310ce7c8..126f8bab 100644
--- a/src/libcamera/include/ipa_manager.h
+++ b/src/libcamera/include/ipa_manager.h
@@ -9,8 +9,8 @@
#include <vector>
-#include <libcamera/ipa/ipa_interface.h>
-#include <libcamera/ipa/ipa_module_info.h>
+#include <ipa/ipa_interface.h>
+#include <ipa/ipa_module_info.h>
#include "ipa_module.h"
#include "pipeline_handler.h"
diff --git a/src/libcamera/include/ipa_module.h b/src/libcamera/include/ipa_module.h
index 18e9223f..97737587 100644
--- a/src/libcamera/include/ipa_module.h
+++ b/src/libcamera/include/ipa_module.h
@@ -10,8 +10,8 @@
#include <memory>
#include <string>
-#include <libcamera/ipa/ipa_interface.h>
-#include <libcamera/ipa/ipa_module_info.h>
+#include <ipa/ipa_interface.h>
+#include <ipa/ipa_module_info.h>
#include "pipeline_handler.h"
diff --git a/src/libcamera/include/ipa_proxy.h b/src/libcamera/include/ipa_proxy.h
index ac57699b..72216662 100644
--- a/src/libcamera/include/ipa_proxy.h
+++ b/src/libcamera/include/ipa_proxy.h
@@ -11,7 +11,7 @@
#include <string>
#include <vector>
-#include <libcamera/ipa/ipa_interface.h>
+#include <ipa/ipa_interface.h>
#include "ipa_module.h"
#include "utils.h"
diff --git a/src/libcamera/ipa_interface.cpp b/src/libcamera/ipa_interface.cpp
index 9d30da29..d7d8ca88 100644
--- a/src/libcamera/ipa_interface.cpp
+++ b/src/libcamera/ipa_interface.cpp
@@ -5,7 +5,7 @@
* ipa_interface.cpp - Image Processing Algorithm interface
*/
-#include <libcamera/ipa/ipa_interface.h>
+#include <ipa/ipa_interface.h>
/**
* \file ipa_interface.h
diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build
index 0706a08b..0916bc41 100644
--- a/src/libcamera/meson.build
+++ b/src/libcamera/meson.build
@@ -120,7 +120,7 @@ libcamera = shared_library('camera',
include_directories : includes,
dependencies : libcamera_deps)
-libcamera_dep = declare_dependency(sources : [libcamera_api, libcamera_h],
+libcamera_dep = declare_dependency(sources : [libcamera_api, libcamera_ipa_api, libcamera_h],
include_directories : libcamera_includes,
link_with : libcamera)
diff --git a/src/libcamera/pipeline/vimc.cpp b/src/libcamera/pipeline/vimc.cpp
index f8f91d62..f26a91f8 100644
--- a/src/libcamera/pipeline/vimc.cpp
+++ b/src/libcamera/pipeline/vimc.cpp
@@ -12,10 +12,10 @@
#include <linux/media-bus-format.h>
+#include <ipa/ipa_interface.h>
+#include <ipa/ipa_module_info.h>
#include <libcamera/camera.h>
#include <libcamera/controls.h>
-#include <libcamera/ipa/ipa_interface.h>
-#include <libcamera/ipa/ipa_module_info.h>
#include <libcamera/request.h>
#include <libcamera/stream.h>
diff --git a/src/libcamera/proxy/ipa_proxy_linux.cpp b/src/libcamera/proxy/ipa_proxy_linux.cpp
index f881aab5..83a74250 100644
--- a/src/libcamera/proxy/ipa_proxy_linux.cpp
+++ b/src/libcamera/proxy/ipa_proxy_linux.cpp
@@ -7,8 +7,8 @@
#include <vector>
-#include <libcamera/ipa/ipa_interface.h>
-#include <libcamera/ipa/ipa_module_info.h>
+#include <ipa/ipa_interface.h>
+#include <ipa/ipa_module_info.h>
#include "ipa_module.h"
#include "ipa_proxy.h"
diff --git a/src/libcamera/proxy/worker/ipa_proxy_linux_worker.cpp b/src/libcamera/proxy/worker/ipa_proxy_linux_worker.cpp
index ffba3ae4..a10761e5 100644
--- a/src/libcamera/proxy/worker/ipa_proxy_linux_worker.cpp
+++ b/src/libcamera/proxy/worker/ipa_proxy_linux_worker.cpp
@@ -9,8 +9,8 @@
#include <sys/types.h>
#include <unistd.h>
+#include <ipa/ipa_interface.h>
#include <libcamera/event_dispatcher.h>
-#include <libcamera/ipa/ipa_interface.h>
#include <libcamera/logging.h>
#include "ipa_module.h"