summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Documentation/Doxyfile.in4
-rw-r--r--Documentation/meson.build1
-rw-r--r--include/ipa/ipa_interface.h (renamed from include/libcamera/ipa/ipa_interface.h)0
-rw-r--r--include/ipa/ipa_module_info.h (renamed from include/libcamera/ipa/ipa_module_info.h)0
-rw-r--r--include/ipa/meson.build7
-rw-r--r--include/libcamera/meson.build10
-rw-r--r--include/meson.build3
-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
17 files changed, 35 insertions, 22 deletions
diff --git a/Documentation/Doxyfile.in b/Documentation/Doxyfile.in
index db939abc..ecc058ee 100644
--- a/Documentation/Doxyfile.in
+++ b/Documentation/Doxyfile.in
@@ -791,7 +791,9 @@ WARN_LOGFILE =
# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
# Note: If this tag is empty the current directory is searched.
-INPUT = "@TOP_SRCDIR@/include/libcamera" "@TOP_SRCDIR@/src/libcamera"
+INPUT = "@TOP_SRCDIR@/include/ipa" \
+ "@TOP_SRCDIR@/include/libcamera" \
+ "@TOP_SRCDIR@/src/libcamera"
# This tag can be used to specify the character encoding of the source files
# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
diff --git a/Documentation/meson.build b/Documentation/meson.build
index a560d02a..4ff3fbeb 100644
--- a/Documentation/meson.build
+++ b/Documentation/meson.build
@@ -21,6 +21,7 @@ if doxygen.found()
input : [
doxyfile,
libcamera_api,
+ libcamera_ipa_api,
libcamera_headers,
libcamera_sources,
],
diff --git a/include/libcamera/ipa/ipa_interface.h b/include/ipa/ipa_interface.h
index 2c5eb1fd..2c5eb1fd 100644
--- a/include/libcamera/ipa/ipa_interface.h
+++ b/include/ipa/ipa_interface.h
diff --git a/include/libcamera/ipa/ipa_module_info.h b/include/ipa/ipa_module_info.h
index d9e33c1d..d9e33c1d 100644
--- a/include/libcamera/ipa/ipa_module_info.h
+++ b/include/ipa/ipa_module_info.h
diff --git a/include/ipa/meson.build b/include/ipa/meson.build
new file mode 100644
index 00000000..a0ce96ba
--- /dev/null
+++ b/include/ipa/meson.build
@@ -0,0 +1,7 @@
+libcamera_ipa_api = files([
+ 'ipa_interface.h',
+ 'ipa_module_info.h',
+])
+
+install_headers(libcamera_ipa_api,
+ subdir: join_paths(libcamera_include_dir, 'ipa'))
diff --git a/include/libcamera/meson.build b/include/libcamera/meson.build
index a8a38a9b..868f1a6b 100644
--- a/include/libcamera/meson.build
+++ b/include/libcamera/meson.build
@@ -8,8 +8,6 @@ libcamera_api = files([
'event_dispatcher.h',
'event_notifier.h',
'geometry.h',
- 'ipa/ipa_interface.h',
- 'ipa/ipa_module_info.h',
'logging.h',
'object.h',
'request.h',
@@ -18,6 +16,8 @@ libcamera_api = files([
'timer.h',
])
+include_dir = join_paths(libcamera_include_dir, 'libcamera')
+
gen_header = files('gen-header.sh')
libcamera_h = custom_target('gen-header',
@@ -25,7 +25,7 @@ libcamera_h = custom_target('gen-header',
output : 'libcamera.h',
command : [gen_header, meson.current_source_dir(), '@OUTPUT@'],
install : true,
- install_dir : 'include/libcamera')
+ install_dir : join_paths('include', include_dir))
version = libcamera_version.split('.')
libcamera_version_config = configuration_data()
@@ -36,7 +36,7 @@ libcamera_version_config.set('LIBCAMERA_VERSION_PATCH', version[2])
configure_file(input : 'version.h.in',
output : 'version.h',
configuration : libcamera_version_config,
- install_dir : 'include/libcamera')
+ install_dir : join_paths('include', include_dir))
install_headers(libcamera_api,
- subdir : 'libcamera')
+ subdir : include_dir)
diff --git a/include/meson.build b/include/meson.build
index a89c0d7f..42b24534 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -1,2 +1,5 @@
+libcamera_include_dir = 'libcamera'
+
subdir('android')
+subdir('ipa')
subdir('libcamera')
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"
generated by cgit v1.2.1 (git 2.18.0) at 2024-05-11 10:11:09 +0000