[libcamera-devel] [PATCH] libcamera: Move ipa includes to the same level as libcamera
Laurent Pinchart
laurent.pinchart at ideasonboard.com
Sun Sep 15 01:48:06 CEST 2019
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 at ideasonboard.com>
---
Documentation/Doxyfile.in | 4 +++-
Documentation/meson.build | 1 +
include/{libcamera => }/ipa/ipa_interface.h | 0
include/{libcamera => }/ipa/ipa_module_info.h | 0
include/ipa/meson.build | 7 +++++++
include/libcamera/meson.build | 10 +++++-----
include/meson.build | 3 +++
src/ipa/ipa_dummy.cpp | 4 ++--
src/ipa/ipa_dummy_isolate.cpp | 4 ++--
src/libcamera/include/ipa_manager.h | 4 ++--
src/libcamera/include/ipa_module.h | 4 ++--
src/libcamera/include/ipa_proxy.h | 2 +-
src/libcamera/ipa_interface.cpp | 2 +-
src/libcamera/meson.build | 2 +-
src/libcamera/pipeline/vimc.cpp | 4 ++--
src/libcamera/proxy/ipa_proxy_linux.cpp | 4 ++--
src/libcamera/proxy/worker/ipa_proxy_linux_worker.cpp | 2 +-
17 files changed, 35 insertions(+), 22 deletions(-)
rename include/{libcamera => }/ipa/ipa_interface.h (100%)
rename include/{libcamera => }/ipa/ipa_module_info.h (100%)
create mode 100644 include/ipa/meson.build
diff --git a/Documentation/Doxyfile.in b/Documentation/Doxyfile.in
index db939abc8319..ecc058eec683 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 a560d02abfa5..4ff3fbeb0674 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
similarity index 100%
rename from include/libcamera/ipa/ipa_interface.h
rename to include/ipa/ipa_interface.h
diff --git a/include/libcamera/ipa/ipa_module_info.h b/include/ipa/ipa_module_info.h
similarity index 100%
rename from include/libcamera/ipa/ipa_module_info.h
rename to include/ipa/ipa_module_info.h
diff --git a/include/ipa/meson.build b/include/ipa/meson.build
new file mode 100644
index 000000000000..a0ce96ba96c3
--- /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 a8a38a9b1db7..868f1a6bf1ab 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 a89c0d7f9e40..42b2453445b5 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 4c8b6657689d..9313aabd2db8 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 24434e85d318..cd66626df2df 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 310ce7c85e84..126f8babbc8f 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 18e9223f028d..97737587ab3a 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 ac57699be949..72216662e373 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 9d30da29228f..d7d8ca8881ef 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 0706a08b270b..0916bc411360 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 f8f91d6219b1..f26a91f86ec1 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 f881aab5b2e1..83a7425077ea 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 ffba3ae4de80..a10761e52b32 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"
--
Regards,
Laurent Pinchart
More information about the libcamera-devel
mailing list