diff options
29 files changed, 34 insertions, 34 deletions
diff --git a/Documentation/Doxyfile.in b/Documentation/Doxyfile.in index c3fe5f66..5f484752 100644 --- a/Documentation/Doxyfile.in +++ b/Documentation/Doxyfile.in @@ -794,8 +794,7 @@ 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/ipa" \ - "@TOP_SRCDIR@/include/libcamera" \ +INPUT = "@TOP_SRCDIR@/include/libcamera" \ "@TOP_SRCDIR@/src/ipa/libipa" \ "@TOP_SRCDIR@/src/libcamera" \ "@TOP_BUILDDIR@/include/libcamera" \ diff --git a/include/libcamera/internal/ipa_context_wrapper.h b/include/libcamera/internal/ipa_context_wrapper.h index a717d406..bd770e13 100644 --- a/include/libcamera/internal/ipa_context_wrapper.h +++ b/include/libcamera/internal/ipa_context_wrapper.h @@ -7,7 +7,7 @@ #ifndef __LIBCAMERA_IPA_CONTEXT_WRAPPER_H__ #define __LIBCAMERA_IPA_CONTEXT_WRAPPER_H__ -#include <ipa/ipa_interface.h> +#include <libcamera/ipa/ipa_interface.h> #include "libcamera/internal/control_serializer.h" diff --git a/include/libcamera/internal/ipa_manager.h b/include/libcamera/internal/ipa_manager.h index f07d91fc..2412d757 100644 --- a/include/libcamera/internal/ipa_manager.h +++ b/include/libcamera/internal/ipa_manager.h @@ -10,8 +10,8 @@ #include <stdint.h> #include <vector> -#include <ipa/ipa_interface.h> -#include <ipa/ipa_module_info.h> +#include <libcamera/ipa/ipa_interface.h> +#include <libcamera/ipa/ipa_module_info.h> #include "libcamera/internal/ipa_module.h" #include "libcamera/internal/pipeline_handler.h" diff --git a/include/libcamera/internal/ipa_module.h b/include/libcamera/internal/ipa_module.h index 2f569db0..5b54cb31 100644 --- a/include/libcamera/internal/ipa_module.h +++ b/include/libcamera/internal/ipa_module.h @@ -11,8 +11,8 @@ #include <string> #include <vector> -#include <ipa/ipa_interface.h> -#include <ipa/ipa_module_info.h> +#include <libcamera/ipa/ipa_interface.h> +#include <libcamera/ipa/ipa_module_info.h> #include "libcamera/internal/log.h" #include "libcamera/internal/pipeline_handler.h" diff --git a/include/libcamera/internal/ipa_proxy.h b/include/libcamera/internal/ipa_proxy.h index 1111065b..e9a36608 100644 --- a/include/libcamera/internal/ipa_proxy.h +++ b/include/libcamera/internal/ipa_proxy.h @@ -11,7 +11,7 @@ #include <string> #include <vector> -#include <ipa/ipa_interface.h> +#include <libcamera/ipa/ipa_interface.h> namespace libcamera { diff --git a/include/ipa/ipa_controls.h b/include/libcamera/ipa/ipa_controls.h index 6d3bf279..6d3bf279 100644 --- a/include/ipa/ipa_controls.h +++ b/include/libcamera/ipa/ipa_controls.h diff --git a/include/ipa/ipa_interface.h b/include/libcamera/ipa/ipa_interface.h index dc9fc714..dc9fc714 100644 --- a/include/ipa/ipa_interface.h +++ b/include/libcamera/ipa/ipa_interface.h diff --git a/include/ipa/ipa_module_info.h b/include/libcamera/ipa/ipa_module_info.h index 3b1c37d2..3b1c37d2 100644 --- a/include/ipa/ipa_module_info.h +++ b/include/libcamera/ipa/ipa_module_info.h diff --git a/include/ipa/ipa_vimc.h b/include/libcamera/ipa/ipa_vimc.h index 8e82dd94..8e82dd94 100644 --- a/include/ipa/ipa_vimc.h +++ b/include/libcamera/ipa/ipa_vimc.h diff --git a/include/ipa/meson.build b/include/libcamera/ipa/meson.build index 3d5c0dd6..3d5c0dd6 100644 --- a/include/ipa/meson.build +++ b/include/libcamera/ipa/meson.build diff --git a/include/ipa/raspberrypi.h b/include/libcamera/ipa/raspberrypi.h index c109469e..c109469e 100644 --- a/include/ipa/raspberrypi.h +++ b/include/libcamera/ipa/raspberrypi.h diff --git a/include/ipa/rkisp1.h b/include/libcamera/ipa/rkisp1.h index 4fe0482b..4fe0482b 100644 --- a/include/ipa/rkisp1.h +++ b/include/libcamera/ipa/rkisp1.h diff --git a/include/libcamera/meson.build b/include/libcamera/meson.build index f9c8e64b..32b8d142 100644 --- a/include/libcamera/meson.build +++ b/include/libcamera/meson.build @@ -24,6 +24,7 @@ libcamera_api = files([ include_dir = join_paths(libcamera_include_dir, 'libcamera') subdir('internal') +subdir('ipa') install_headers(libcamera_api, subdir : include_dir) diff --git a/include/meson.build b/include/meson.build index 4f41c9ce..2ac9a3a0 100644 --- a/include/meson.build +++ b/include/meson.build @@ -3,5 +3,4 @@ libcamera_include_dir = 'libcamera' subdir('android') -subdir('ipa') subdir('libcamera') diff --git a/src/ipa/libipa/ipa_interface_wrapper.cpp b/src/ipa/libipa/ipa_interface_wrapper.cpp index 90f270c0..2a2e43ab 100644 --- a/src/ipa/libipa/ipa_interface_wrapper.cpp +++ b/src/ipa/libipa/ipa_interface_wrapper.cpp @@ -12,7 +12,7 @@ #include <unistd.h> #include <vector> -#include <ipa/ipa_interface.h> +#include <libcamera/ipa/ipa_interface.h> #include "libcamera/internal/byte_stream_buffer.h" #include "libcamera/internal/camera_sensor.h" diff --git a/src/ipa/libipa/ipa_interface_wrapper.h b/src/ipa/libipa/ipa_interface_wrapper.h index b426034d..a1c70159 100644 --- a/src/ipa/libipa/ipa_interface_wrapper.h +++ b/src/ipa/libipa/ipa_interface_wrapper.h @@ -9,7 +9,7 @@ #include <memory> -#include <ipa/ipa_interface.h> +#include <libcamera/ipa/ipa_interface.h> #include "libcamera/internal/control_serializer.h" diff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp index 46b24453..9669f212 100644 --- a/src/ipa/raspberrypi/raspberrypi.cpp +++ b/src/ipa/raspberrypi/raspberrypi.cpp @@ -12,14 +12,15 @@ #include <string.h> #include <sys/mman.h> -#include <ipa/ipa_interface.h> -#include <ipa/ipa_module_info.h> -#include <ipa/raspberrypi.h> #include <libcamera/buffer.h> #include <libcamera/control_ids.h> #include <libcamera/controls.h> +#include <libcamera/ipa/ipa_interface.h> +#include <libcamera/ipa/ipa_module_info.h> +#include <libcamera/ipa/raspberrypi.h> #include <libcamera/request.h> #include <libcamera/span.h> + #include <libipa/ipa_interface_wrapper.h> #include "libcamera/internal/camera_sensor.h" diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp index 4f6e0342..fbdc908f 100644 --- a/src/ipa/rkisp1/rkisp1.cpp +++ b/src/ipa/rkisp1/rkisp1.cpp @@ -14,12 +14,13 @@ #include <linux/rkisp1-config.h> -#include <ipa/ipa_interface.h> -#include <ipa/ipa_module_info.h> -#include <ipa/rkisp1.h> #include <libcamera/buffer.h> #include <libcamera/control_ids.h> +#include <libcamera/ipa/ipa_interface.h> +#include <libcamera/ipa/ipa_module_info.h> +#include <libcamera/ipa/rkisp1.h> #include <libcamera/request.h> + #include <libipa/ipa_interface_wrapper.h> #include "libcamera/internal/log.h" diff --git a/src/ipa/vimc/vimc.cpp b/src/ipa/vimc/vimc.cpp index 3fa6be65..af278a48 100644 --- a/src/ipa/vimc/vimc.cpp +++ b/src/ipa/vimc/vimc.cpp @@ -5,7 +5,7 @@ * ipa_vimc.cpp - Vimc Image Processing Algorithm module */ -#include <ipa/ipa_vimc.h> +#include <libcamera/ipa/ipa_vimc.h> #include <fcntl.h> #include <string.h> @@ -14,8 +14,8 @@ #include <iostream> -#include <ipa/ipa_interface.h> -#include <ipa/ipa_module_info.h> +#include <libcamera/ipa/ipa_interface.h> +#include <libcamera/ipa/ipa_module_info.h> #include <libipa/ipa_interface_wrapper.h> diff --git a/src/libcamera/control_serializer.cpp b/src/libcamera/control_serializer.cpp index bf162b6c..258db6df 100644 --- a/src/libcamera/control_serializer.cpp +++ b/src/libcamera/control_serializer.cpp @@ -11,9 +11,9 @@ #include <memory> #include <vector> -#include <ipa/ipa_controls.h> #include <libcamera/control_ids.h> #include <libcamera/controls.h> +#include <libcamera/ipa/ipa_controls.h> #include <libcamera/span.h> #include "libcamera/internal/byte_stream_buffer.h" diff --git a/src/libcamera/ipa_controls.cpp b/src/libcamera/ipa_controls.cpp index b1d14190..8fd72651 100644 --- a/src/libcamera/ipa_controls.cpp +++ b/src/libcamera/ipa_controls.cpp @@ -5,7 +5,7 @@ * ipa_controls.cpp - IPA control handling */ -#include <ipa/ipa_controls.h> +#include <libcamera/ipa/ipa_controls.h> /** * \file ipa_controls.h diff --git a/src/libcamera/ipa_interface.cpp b/src/libcamera/ipa_interface.cpp index c890eada..69835e63 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 <ipa/ipa_interface.h> +#include <libcamera/ipa/ipa_interface.h> /** * \file ipa_interface.h diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp index e254e555..07ca9f5d 100644 --- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp +++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp @@ -11,9 +11,9 @@ #include <queue> #include <sys/mman.h> -#include <ipa/raspberrypi.h> #include <libcamera/camera.h> #include <libcamera/control_ids.h> +#include <libcamera/ipa/raspberrypi.h> #include <libcamera/logging.h> #include <libcamera/request.h> #include <libcamera/stream.h> diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp index 7a0c8771..d807fc2c 100644 --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp @@ -13,10 +13,10 @@ #include <linux/media-bus-format.h> -#include <ipa/rkisp1.h> #include <libcamera/buffer.h> #include <libcamera/camera.h> #include <libcamera/control_ids.h> +#include <libcamera/ipa/rkisp1.h> #include <libcamera/request.h> #include <libcamera/stream.h> diff --git a/src/libcamera/pipeline/vimc/vimc.cpp b/src/libcamera/pipeline/vimc/vimc.cpp index 50a9f2df..ca36348a 100644 --- a/src/libcamera/pipeline/vimc/vimc.cpp +++ b/src/libcamera/pipeline/vimc/vimc.cpp @@ -14,11 +14,11 @@ #include <linux/media-bus-format.h> #include <linux/version.h> -#include <ipa/ipa_interface.h> -#include <ipa/ipa_module_info.h> #include <libcamera/camera.h> #include <libcamera/control_ids.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 7d6f8799..be34f20a 100644 --- a/src/libcamera/proxy/ipa_proxy_linux.cpp +++ b/src/libcamera/proxy/ipa_proxy_linux.cpp @@ -7,8 +7,8 @@ #include <vector> -#include <ipa/ipa_interface.h> -#include <ipa/ipa_module_info.h> +#include <libcamera/ipa/ipa_interface.h> +#include <libcamera/ipa/ipa_module_info.h> #include "libcamera/internal/ipa_module.h" #include "libcamera/internal/ipa_proxy.h" diff --git a/src/libcamera/proxy/ipa_proxy_thread.cpp b/src/libcamera/proxy/ipa_proxy_thread.cpp index 03d4c0d9..6fbebed2 100644 --- a/src/libcamera/proxy/ipa_proxy_thread.cpp +++ b/src/libcamera/proxy/ipa_proxy_thread.cpp @@ -7,8 +7,8 @@ #include <memory> -#include <ipa/ipa_interface.h> -#include <ipa/ipa_module_info.h> +#include <libcamera/ipa/ipa_interface.h> +#include <libcamera/ipa/ipa_module_info.h> #include "libcamera/internal/ipa_context_wrapper.h" #include "libcamera/internal/ipa_module.h" diff --git a/src/libcamera/proxy/worker/ipa_proxy_linux_worker.cpp b/src/libcamera/proxy/worker/ipa_proxy_linux_worker.cpp index 9ba94d01..0c4687f7 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 "libcamera/internal/ipa_module.h" diff --git a/test/ipa/ipa_interface_test.cpp b/test/ipa/ipa_interface_test.cpp index c394377d..2f02af49 100644 --- a/test/ipa/ipa_interface_test.cpp +++ b/test/ipa/ipa_interface_test.cpp @@ -14,10 +14,9 @@ #include <libcamera/event_dispatcher.h> #include <libcamera/event_notifier.h> +#include <libcamera/ipa/ipa_vimc.h> #include <libcamera/timer.h> -#include <ipa/ipa_vimc.h> - #include "libcamera/internal/device_enumerator.h" #include "libcamera/internal/ipa_manager.h" #include "libcamera/internal/ipa_module.h" |