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>

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

Documentation/meson.build

@@ -21,6 +21,7 @@ if doxygen.found()
                   input : [
                       doxyfile,
                       libcamera_api,
+                      libcamera_ipa_api,
                       libcamera_headers,
                       libcamera_sources,
                   ],

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'))

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)

include/meson.build

@@ -1,2 +1,5 @@
+libcamera_include_dir = 'libcamera'
+
 subdir('android')
+subdir('ipa')
 subdir('libcamera')

src/ipa/ipa_dummy.cpp

@@ -7,8 +7,8 @@
 
 #include <iostream>
 
-#include <libcamera/ipa/ipa_interface.h>
+#include <ipa/ipa_interface.h>
-#include <libcamera/ipa/ipa_module_info.h>
+#include <ipa/ipa_module_info.h>
 
 namespace libcamera {
 

src/ipa/ipa_dummy_isolate.cpp

@@ -8,8 +8,8 @@
 
 #include <iostream>
 
-#include <libcamera/ipa/ipa_interface.h>
+#include <ipa/ipa_interface.h>
-#include <libcamera/ipa/ipa_module_info.h>
+#include <ipa/ipa_module_info.h>
 
 namespace libcamera {
 

src/libcamera/include/ipa_manager.h

@@ -9,8 +9,8 @@
 
 #include <vector>
 
-#include <libcamera/ipa/ipa_interface.h>
+#include <ipa/ipa_interface.h>
-#include <libcamera/ipa/ipa_module_info.h>
+#include <ipa/ipa_module_info.h>
 
 #include "ipa_module.h"
 #include "pipeline_handler.h"

src/libcamera/include/ipa_module.h

@@ -10,8 +10,8 @@
 #include <memory>
 #include <string>
 
-#include <libcamera/ipa/ipa_interface.h>
+#include <ipa/ipa_interface.h>
-#include <libcamera/ipa/ipa_module_info.h>
+#include <ipa/ipa_module_info.h>
 
 #include "pipeline_handler.h"
 

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"

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

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)
 

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>
 

src/libcamera/proxy/ipa_proxy_linux.cpp

@@ -7,8 +7,8 @@
 
 #include <vector>
 
-#include <libcamera/ipa/ipa_interface.h>
+#include <ipa/ipa_interface.h>
-#include <libcamera/ipa/ipa_module_info.h>
+#include <ipa/ipa_module_info.h>
 
 #include "ipa_module.h"
 #include "ipa_proxy.h"

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"