diff --git a/Documentation/Doxyfile.in b/Documentation/Doxyfile.in index 86bcc4d00..c3fe5f663 100644 --- a/Documentation/Doxyfile.in +++ b/Documentation/Doxyfile.in @@ -842,10 +842,10 @@ RECURSIVE = YES # run. EXCLUDE = @TOP_SRCDIR@/include/libcamera/span.h \ + @TOP_SRCDIR@/include/libcamera/internal/device_enumerator_sysfs.h \ + @TOP_SRCDIR@/include/libcamera/internal/device_enumerator_udev.h \ @TOP_SRCDIR@/src/libcamera/device_enumerator_sysfs.cpp \ @TOP_SRCDIR@/src/libcamera/device_enumerator_udev.cpp \ - @TOP_SRCDIR@/src/libcamera/include/device_enumerator_sysfs.h \ - @TOP_SRCDIR@/src/libcamera/include/device_enumerator_udev.h \ @TOP_SRCDIR@/src/libcamera/pipeline/ \ @TOP_SRCDIR@/src/libcamera/proxy/ @@ -2053,7 +2053,7 @@ SEARCH_INCLUDES = YES # preprocessor. # This tag requires that the tag SEARCH_INCLUDES is set to YES. -INCLUDE_PATH = "@TOP_SRCDIR@/include/libcamera" "@TOP_SRCDIR@/src/libcamera/include" +INCLUDE_PATH = "@TOP_SRCDIR@/include/libcamera" # You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard # patterns (like *.h and *.hpp) to filter out the header-files in the diff --git a/src/libcamera/include/byte_stream_buffer.h b/include/libcamera/internal/byte_stream_buffer.h similarity index 100% rename from src/libcamera/include/byte_stream_buffer.h rename to include/libcamera/internal/byte_stream_buffer.h diff --git a/src/libcamera/include/camera_controls.h b/include/libcamera/internal/camera_controls.h similarity index 91% rename from src/libcamera/include/camera_controls.h rename to include/libcamera/internal/camera_controls.h index 265c1fe37..dc8b3ba84 100644 --- a/src/libcamera/include/camera_controls.h +++ b/include/libcamera/internal/camera_controls.h @@ -7,7 +7,7 @@ #ifndef __LIBCAMERA_CAMERA_CONTROLS_H__ #define __LIBCAMERA_CAMERA_CONTROLS_H__ -#include "control_validator.h" +#include "libcamera/internal/control_validator.h" namespace libcamera { diff --git a/src/libcamera/include/camera_sensor.h b/include/libcamera/internal/camera_sensor.h similarity index 96% rename from src/libcamera/include/camera_sensor.h rename to include/libcamera/internal/camera_sensor.h index 30cf5f34f..d79bd9ce9 100644 --- a/src/libcamera/include/camera_sensor.h +++ b/include/libcamera/internal/camera_sensor.h @@ -14,8 +14,8 @@ #include #include -#include "formats.h" -#include "log.h" +#include "libcamera/internal/formats.h" +#include "libcamera/internal/log.h" namespace libcamera { diff --git a/src/libcamera/include/control_serializer.h b/include/libcamera/internal/control_serializer.h similarity index 100% rename from src/libcamera/include/control_serializer.h rename to include/libcamera/internal/control_serializer.h diff --git a/src/libcamera/include/control_validator.h b/include/libcamera/internal/control_validator.h similarity index 100% rename from src/libcamera/include/control_validator.h rename to include/libcamera/internal/control_validator.h diff --git a/src/libcamera/include/device_enumerator.h b/include/libcamera/internal/device_enumerator.h similarity index 100% rename from src/libcamera/include/device_enumerator.h rename to include/libcamera/internal/device_enumerator.h diff --git a/src/libcamera/include/device_enumerator_sysfs.h b/include/libcamera/internal/device_enumerator_sysfs.h similarity index 92% rename from src/libcamera/include/device_enumerator_sysfs.h rename to include/libcamera/internal/device_enumerator_sysfs.h index 5a5c9b0f5..a63e737a7 100644 --- a/src/libcamera/include/device_enumerator_sysfs.h +++ b/include/libcamera/internal/device_enumerator_sysfs.h @@ -10,7 +10,7 @@ #include #include -#include "device_enumerator.h" +#include "libcamera/internal/device_enumerator.h" class MediaDevice; diff --git a/src/libcamera/include/device_enumerator_udev.h b/include/libcamera/internal/device_enumerator_udev.h similarity index 96% rename from src/libcamera/include/device_enumerator_udev.h rename to include/libcamera/internal/device_enumerator_udev.h index fdce4520f..fdaa20968 100644 --- a/src/libcamera/include/device_enumerator_udev.h +++ b/include/libcamera/internal/device_enumerator_udev.h @@ -14,7 +14,7 @@ #include #include -#include "device_enumerator.h" +#include "libcamera/internal/device_enumerator.h" struct udev; struct udev_device; diff --git a/src/libcamera/include/event_dispatcher_poll.h b/include/libcamera/internal/event_dispatcher_poll.h similarity index 100% rename from src/libcamera/include/event_dispatcher_poll.h rename to include/libcamera/internal/event_dispatcher_poll.h diff --git a/src/libcamera/include/file.h b/include/libcamera/internal/file.h similarity index 100% rename from src/libcamera/include/file.h rename to include/libcamera/internal/file.h diff --git a/src/libcamera/include/formats.h b/include/libcamera/internal/formats.h similarity index 96% rename from src/libcamera/include/formats.h rename to include/libcamera/internal/formats.h index 291a1108a..4092a93ef 100644 --- a/src/libcamera/include/formats.h +++ b/include/libcamera/internal/formats.h @@ -14,7 +14,7 @@ #include #include -#include "v4l2_pixelformat.h" +#include "libcamera/internal/v4l2_pixelformat.h" namespace libcamera { diff --git a/src/libcamera/include/ipa_context_wrapper.h b/include/libcamera/internal/ipa_context_wrapper.h similarity index 96% rename from src/libcamera/include/ipa_context_wrapper.h rename to include/libcamera/internal/ipa_context_wrapper.h index 0db022ef5..a717d4067 100644 --- a/src/libcamera/include/ipa_context_wrapper.h +++ b/include/libcamera/internal/ipa_context_wrapper.h @@ -9,7 +9,7 @@ #include -#include "control_serializer.h" +#include "libcamera/internal/control_serializer.h" namespace libcamera { diff --git a/src/libcamera/include/ipa_manager.h b/include/libcamera/internal/ipa_manager.h similarity index 88% rename from src/libcamera/include/ipa_manager.h rename to include/libcamera/internal/ipa_manager.h index aa6b9adb1..f07d91fc7 100644 --- a/src/libcamera/include/ipa_manager.h +++ b/include/libcamera/internal/ipa_manager.h @@ -13,9 +13,9 @@ #include #include -#include "ipa_module.h" -#include "pipeline_handler.h" -#include "pub_key.h" +#include "libcamera/internal/ipa_module.h" +#include "libcamera/internal/pipeline_handler.h" +#include "libcamera/internal/pub_key.h" namespace libcamera { diff --git a/src/libcamera/include/ipa_module.h b/include/libcamera/internal/ipa_module.h similarity index 93% rename from src/libcamera/include/ipa_module.h rename to include/libcamera/internal/ipa_module.h index 15022e19e..2f569db0b 100644 --- a/src/libcamera/include/ipa_module.h +++ b/include/libcamera/internal/ipa_module.h @@ -14,8 +14,8 @@ #include #include -#include "log.h" -#include "pipeline_handler.h" +#include "libcamera/internal/log.h" +#include "libcamera/internal/pipeline_handler.h" namespace libcamera { diff --git a/src/libcamera/include/ipa_proxy.h b/include/libcamera/internal/ipa_proxy.h similarity index 100% rename from src/libcamera/include/ipa_proxy.h rename to include/libcamera/internal/ipa_proxy.h diff --git a/src/libcamera/include/ipc_unixsocket.h b/include/libcamera/internal/ipc_unixsocket.h similarity index 100% rename from src/libcamera/include/ipc_unixsocket.h rename to include/libcamera/internal/ipc_unixsocket.h diff --git a/src/libcamera/include/log.h b/include/libcamera/internal/log.h similarity index 98% rename from src/libcamera/include/log.h rename to include/libcamera/internal/log.h index ee0b4069b..cab2034aa 100644 --- a/src/libcamera/include/log.h +++ b/include/libcamera/internal/log.h @@ -10,7 +10,7 @@ #include #include -#include "utils.h" +#include "libcamera/internal/utils.h" namespace libcamera { diff --git a/src/libcamera/include/media_device.h b/include/libcamera/internal/media_device.h similarity index 96% rename from src/libcamera/include/media_device.h rename to include/libcamera/internal/media_device.h index 4d9f76618..9fe76c514 100644 --- a/src/libcamera/include/media_device.h +++ b/include/libcamera/internal/media_device.h @@ -16,8 +16,8 @@ #include -#include "log.h" -#include "media_object.h" +#include "libcamera/internal/log.h" +#include "libcamera/internal/media_object.h" namespace libcamera { diff --git a/src/libcamera/include/media_object.h b/include/libcamera/internal/media_object.h similarity index 100% rename from src/libcamera/include/media_object.h rename to include/libcamera/internal/media_object.h diff --git a/src/libcamera/include/meson.build b/include/libcamera/internal/meson.build similarity index 100% rename from src/libcamera/include/meson.build rename to include/libcamera/internal/meson.build diff --git a/src/libcamera/include/message.h b/include/libcamera/internal/message.h similarity index 100% rename from src/libcamera/include/message.h rename to include/libcamera/internal/message.h diff --git a/src/libcamera/include/pipeline_handler.h b/include/libcamera/internal/pipeline_handler.h similarity index 98% rename from src/libcamera/include/pipeline_handler.h rename to include/libcamera/internal/pipeline_handler.h index 706413fa6..428f5887c 100644 --- a/src/libcamera/include/pipeline_handler.h +++ b/include/libcamera/internal/pipeline_handler.h @@ -19,7 +19,7 @@ #include #include -#include "ipa_proxy.h" +#include "libcamera/internal/ipa_proxy.h" namespace libcamera { diff --git a/src/libcamera/include/process.h b/include/libcamera/internal/process.h similarity index 100% rename from src/libcamera/include/process.h rename to include/libcamera/internal/process.h diff --git a/src/libcamera/include/pub_key.h b/include/libcamera/internal/pub_key.h similarity index 100% rename from src/libcamera/include/pub_key.h rename to include/libcamera/internal/pub_key.h diff --git a/src/libcamera/include/semaphore.h b/include/libcamera/internal/semaphore.h similarity index 94% rename from src/libcamera/include/semaphore.h rename to include/libcamera/internal/semaphore.h index c6b286536..4d93077c7 100644 --- a/src/libcamera/include/semaphore.h +++ b/include/libcamera/internal/semaphore.h @@ -9,7 +9,7 @@ #include -#include "thread.h" +#include "libcamera/internal/thread.h" namespace libcamera { diff --git a/src/libcamera/include/thread.h b/include/libcamera/internal/thread.h similarity index 97% rename from src/libcamera/include/thread.h rename to include/libcamera/internal/thread.h index d700f111a..6594c9b06 100644 --- a/src/libcamera/include/thread.h +++ b/include/libcamera/internal/thread.h @@ -14,7 +14,7 @@ #include -#include "utils.h" +#include "libcamera/internal/utils.h" namespace libcamera { diff --git a/src/libcamera/include/utils.h b/include/libcamera/internal/utils.h similarity index 100% rename from src/libcamera/include/utils.h rename to include/libcamera/internal/utils.h diff --git a/src/libcamera/include/v4l2_controls.h b/include/libcamera/internal/v4l2_controls.h similarity index 100% rename from src/libcamera/include/v4l2_controls.h rename to include/libcamera/internal/v4l2_controls.h diff --git a/src/libcamera/include/v4l2_device.h b/include/libcamera/internal/v4l2_device.h similarity index 94% rename from src/libcamera/include/v4l2_device.h rename to include/libcamera/internal/v4l2_device.h index e604a40df..d491eafd2 100644 --- a/src/libcamera/include/v4l2_device.h +++ b/include/libcamera/internal/v4l2_device.h @@ -13,8 +13,8 @@ #include -#include "log.h" -#include "v4l2_controls.h" +#include "libcamera/internal/log.h" +#include "libcamera/internal/v4l2_controls.h" namespace libcamera { diff --git a/src/libcamera/include/v4l2_pixelformat.h b/include/libcamera/internal/v4l2_pixelformat.h similarity index 100% rename from src/libcamera/include/v4l2_pixelformat.h rename to include/libcamera/internal/v4l2_pixelformat.h diff --git a/src/libcamera/include/v4l2_subdevice.h b/include/libcamera/internal/v4l2_subdevice.h similarity index 90% rename from src/libcamera/include/v4l2_subdevice.h rename to include/libcamera/internal/v4l2_subdevice.h index d0e565dbd..1be454f0d 100644 --- a/src/libcamera/include/v4l2_subdevice.h +++ b/include/libcamera/internal/v4l2_subdevice.h @@ -12,10 +12,10 @@ #include -#include "formats.h" -#include "log.h" -#include "media_object.h" -#include "v4l2_device.h" +#include "libcamera/internal/formats.h" +#include "libcamera/internal/log.h" +#include "libcamera/internal/media_object.h" +#include "libcamera/internal/v4l2_device.h" namespace libcamera { diff --git a/src/libcamera/include/v4l2_videodevice.h b/include/libcamera/internal/v4l2_videodevice.h similarity index 97% rename from src/libcamera/include/v4l2_videodevice.h rename to include/libcamera/internal/v4l2_videodevice.h index 94565b97b..dc2595235 100644 --- a/src/libcamera/include/v4l2_videodevice.h +++ b/include/libcamera/internal/v4l2_videodevice.h @@ -20,10 +20,10 @@ #include #include -#include "formats.h" -#include "log.h" -#include "v4l2_device.h" -#include "v4l2_pixelformat.h" +#include "libcamera/internal/formats.h" +#include "libcamera/internal/log.h" +#include "libcamera/internal/v4l2_device.h" +#include "libcamera/internal/v4l2_pixelformat.h" namespace libcamera { diff --git a/include/libcamera/meson.build b/include/libcamera/meson.build index cea47eb83..f9c8e64bd 100644 --- a/include/libcamera/meson.build +++ b/include/libcamera/meson.build @@ -23,6 +23,8 @@ libcamera_api = files([ include_dir = join_paths(libcamera_include_dir, 'libcamera') +subdir('internal') + install_headers(libcamera_api, subdir : include_dir) diff --git a/src/android/camera3_hal.cpp b/src/android/camera3_hal.cpp index 34301ed97..716e36c72 100644 --- a/src/android/camera3_hal.cpp +++ b/src/android/camera3_hal.cpp @@ -7,9 +7,10 @@ #include +#include "libcamera/internal/log.h" + #include "camera_device.h" #include "camera_hal_manager.h" -#include "log.h" using namespace libcamera; diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp index 76af70ebc..4ec429fc3 100644 --- a/src/android/camera_device.cpp +++ b/src/android/camera_device.cpp @@ -11,8 +11,8 @@ #include #include -#include "log.h" -#include "utils.h" +#include "libcamera/internal/log.h" +#include "libcamera/internal/utils.h" #include "camera_metadata.h" diff --git a/src/android/camera_device.h b/src/android/camera_device.h index 55eac317e..bce1cfbc8 100644 --- a/src/android/camera_device.h +++ b/src/android/camera_device.h @@ -16,7 +16,7 @@ #include #include -#include "message.h" +#include "libcamera/internal/message.h" class CameraMetadata; diff --git a/src/android/camera_hal_manager.cpp b/src/android/camera_hal_manager.cpp index 5bd3bdba8..759e320dc 100644 --- a/src/android/camera_hal_manager.cpp +++ b/src/android/camera_hal_manager.cpp @@ -9,7 +9,7 @@ #include -#include "log.h" +#include "libcamera/internal/log.h" #include "camera_device.h" diff --git a/src/android/camera_metadata.cpp b/src/android/camera_metadata.cpp index 76965108c..47b2e4ef1 100644 --- a/src/android/camera_metadata.cpp +++ b/src/android/camera_metadata.cpp @@ -7,7 +7,7 @@ #include "camera_metadata.h" -#include "log.h" +#include "libcamera/internal/log.h" using namespace libcamera; diff --git a/src/ipa/libipa/ipa_interface_wrapper.cpp b/src/ipa/libipa/ipa_interface_wrapper.cpp index 21d8c98bd..90f270c02 100644 --- a/src/ipa/libipa/ipa_interface_wrapper.cpp +++ b/src/ipa/libipa/ipa_interface_wrapper.cpp @@ -14,8 +14,8 @@ #include -#include "byte_stream_buffer.h" -#include "camera_sensor.h" +#include "libcamera/internal/byte_stream_buffer.h" +#include "libcamera/internal/camera_sensor.h" /** * \file ipa_interface_wrapper.h diff --git a/src/ipa/libipa/ipa_interface_wrapper.h b/src/ipa/libipa/ipa_interface_wrapper.h index 56507aafd..b426034d5 100644 --- a/src/ipa/libipa/ipa_interface_wrapper.h +++ b/src/ipa/libipa/ipa_interface_wrapper.h @@ -11,7 +11,7 @@ #include -#include "control_serializer.h" +#include "libcamera/internal/control_serializer.h" namespace libcamera { diff --git a/src/ipa/meson.build b/src/ipa/meson.build index ab73c3470..5a5de267c 100644 --- a/src/ipa/meson.build +++ b/src/ipa/meson.build @@ -6,7 +6,6 @@ ipa_sysconf_dir = join_paths(get_option('sysconfdir'), 'libcamera', 'ipa') ipa_includes = [ libcamera_includes, - libcamera_internal_includes, ] config_h.set('IPA_CONFIG_DIR', diff --git a/src/ipa/raspberrypi/cam_helper.cpp b/src/ipa/raspberrypi/cam_helper.cpp index 7f05d2c6b..a0c73f993 100644 --- a/src/ipa/raspberrypi/cam_helper.cpp +++ b/src/ipa/raspberrypi/cam_helper.cpp @@ -11,11 +11,11 @@ #include #include +#include "libcamera/internal/v4l2_videodevice.h" + #include "cam_helper.hpp" #include "md_parser.hpp" -#include "v4l2_videodevice.h" - using namespace RPi; static std::map cam_helpers; diff --git a/src/ipa/raspberrypi/cam_helper.hpp b/src/ipa/raspberrypi/cam_helper.hpp index 0c8aa29a4..6877f4735 100644 --- a/src/ipa/raspberrypi/cam_helper.hpp +++ b/src/ipa/raspberrypi/cam_helper.hpp @@ -11,7 +11,7 @@ #include "camera_mode.h" #include "md_parser.hpp" -#include "v4l2_videodevice.h" +#include "libcamera/internal/v4l2_videodevice.h" namespace RPi { diff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp index 3bcc08156..46b244538 100644 --- a/src/ipa/raspberrypi/raspberrypi.cpp +++ b/src/ipa/raspberrypi/raspberrypi.cpp @@ -22,6 +22,10 @@ #include #include +#include "libcamera/internal/camera_sensor.h" +#include "libcamera/internal/log.h" +#include "libcamera/internal/utils.h" + #include #include "agc_algorithm.hpp" @@ -44,10 +48,6 @@ #include "sdn_status.h" #include "sharpen_status.h" -#include "camera_sensor.h" -#include "log.h" -#include "utils.h" - namespace libcamera { /* Configure the sensor with these values initially. */ diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp index bfa88418f..4f6e0342d 100644 --- a/src/ipa/rkisp1/rkisp1.cpp +++ b/src/ipa/rkisp1/rkisp1.cpp @@ -22,8 +22,8 @@ #include #include -#include "log.h" -#include "utils.h" +#include "libcamera/internal/log.h" +#include "libcamera/internal/utils.h" namespace libcamera { diff --git a/src/ipa/vimc/vimc.cpp b/src/ipa/vimc/vimc.cpp index 9271f2d8a..3fa6be653 100644 --- a/src/ipa/vimc/vimc.cpp +++ b/src/ipa/vimc/vimc.cpp @@ -19,8 +19,8 @@ #include -#include "file.h" -#include "log.h" +#include "libcamera/internal/file.h" +#include "libcamera/internal/log.h" namespace libcamera { diff --git a/src/libcamera/bound_method.cpp b/src/libcamera/bound_method.cpp index 9aa59dc36..9993e5969 100644 --- a/src/libcamera/bound_method.cpp +++ b/src/libcamera/bound_method.cpp @@ -7,9 +7,9 @@ #include -#include "message.h" -#include "semaphore.h" -#include "thread.h" +#include "libcamera/internal/message.h" +#include "libcamera/internal/semaphore.h" +#include "libcamera/internal/thread.h" /** * \file bound_method.h diff --git a/src/libcamera/buffer.cpp b/src/libcamera/buffer.cpp index 0c5e56cf1..1a1d4bac7 100644 --- a/src/libcamera/buffer.cpp +++ b/src/libcamera/buffer.cpp @@ -12,7 +12,7 @@ #include #include -#include "log.h" +#include "libcamera/internal/log.h" /** * \file buffer.h diff --git a/src/libcamera/byte_stream_buffer.cpp b/src/libcamera/byte_stream_buffer.cpp index 20d6a6552..df7029b02 100644 --- a/src/libcamera/byte_stream_buffer.cpp +++ b/src/libcamera/byte_stream_buffer.cpp @@ -5,12 +5,12 @@ * byte_stream_buffer.cpp - Byte stream buffer */ -#include "byte_stream_buffer.h" +#include "libcamera/internal/byte_stream_buffer.h" #include #include -#include "log.h" +#include "libcamera/internal/log.h" namespace libcamera { diff --git a/src/libcamera/camera.cpp b/src/libcamera/camera.cpp index 8c3bb2c2a..eac769a43 100644 --- a/src/libcamera/camera.cpp +++ b/src/libcamera/camera.cpp @@ -14,9 +14,9 @@ #include #include -#include "log.h" -#include "pipeline_handler.h" -#include "utils.h" +#include "libcamera/internal/log.h" +#include "libcamera/internal/pipeline_handler.h" +#include "libcamera/internal/utils.h" /** * \file camera.h diff --git a/src/libcamera/camera_controls.cpp b/src/libcamera/camera_controls.cpp index 59dcede2c..371f6d079 100644 --- a/src/libcamera/camera_controls.cpp +++ b/src/libcamera/camera_controls.cpp @@ -5,7 +5,7 @@ * camera_controls.cpp - Camera controls */ -#include "camera_controls.h" +#include "libcamera/internal/camera_controls.h" #include #include diff --git a/src/libcamera/camera_manager.cpp b/src/libcamera/camera_manager.cpp index fddf7349e..849377ad2 100644 --- a/src/libcamera/camera_manager.cpp +++ b/src/libcamera/camera_manager.cpp @@ -13,12 +13,12 @@ #include #include -#include "device_enumerator.h" -#include "event_dispatcher_poll.h" -#include "log.h" -#include "pipeline_handler.h" -#include "thread.h" -#include "utils.h" +#include "libcamera/internal/device_enumerator.h" +#include "libcamera/internal/event_dispatcher_poll.h" +#include "libcamera/internal/log.h" +#include "libcamera/internal/pipeline_handler.h" +#include "libcamera/internal/thread.h" +#include "libcamera/internal/utils.h" /** * \file camera_manager.h diff --git a/src/libcamera/camera_sensor.cpp b/src/libcamera/camera_sensor.cpp index 31a916a92..174df17cf 100644 --- a/src/libcamera/camera_sensor.cpp +++ b/src/libcamera/camera_sensor.cpp @@ -5,7 +5,7 @@ * camera_sensor.cpp - A camera sensor */ -#include "camera_sensor.h" +#include "libcamera/internal/camera_sensor.h" #include #include @@ -16,9 +16,9 @@ #include -#include "formats.h" -#include "utils.h" -#include "v4l2_subdevice.h" +#include "libcamera/internal/formats.h" +#include "libcamera/internal/utils.h" +#include "libcamera/internal/v4l2_subdevice.h" /** * \file camera_sensor.h diff --git a/src/libcamera/control_serializer.cpp b/src/libcamera/control_serializer.cpp index fcff5e56f..bf162b6cc 100644 --- a/src/libcamera/control_serializer.cpp +++ b/src/libcamera/control_serializer.cpp @@ -5,7 +5,7 @@ * control_serializer.cpp - Control (de)serializer */ -#include "control_serializer.h" +#include "libcamera/internal/control_serializer.h" #include #include @@ -16,8 +16,8 @@ #include #include -#include "byte_stream_buffer.h" -#include "log.h" +#include "libcamera/internal/byte_stream_buffer.h" +#include "libcamera/internal/log.h" /** * \file control_serializer.h diff --git a/src/libcamera/control_validator.cpp b/src/libcamera/control_validator.cpp index 8e5cf3c3e..5a2f27ac9 100644 --- a/src/libcamera/control_validator.cpp +++ b/src/libcamera/control_validator.cpp @@ -5,7 +5,7 @@ * control_validator.cpp - Control validator */ -#include "control_validator.h" +#include "libcamera/internal/control_validator.h" /** * \file control_validator.h diff --git a/src/libcamera/controls.cpp b/src/libcamera/controls.cpp index 08df7f29e..dca782667 100644 --- a/src/libcamera/controls.cpp +++ b/src/libcamera/controls.cpp @@ -12,9 +12,9 @@ #include #include -#include "control_validator.h" -#include "log.h" -#include "utils.h" +#include "libcamera/internal/control_validator.h" +#include "libcamera/internal/log.h" +#include "libcamera/internal/utils.h" /** * \file controls.h diff --git a/src/libcamera/device_enumerator.cpp b/src/libcamera/device_enumerator.cpp index dd17e3e32..e21a2a7de 100644 --- a/src/libcamera/device_enumerator.cpp +++ b/src/libcamera/device_enumerator.cpp @@ -5,14 +5,14 @@ * device_enumerator.cpp - Enumeration and matching */ -#include "device_enumerator.h" -#include "device_enumerator_sysfs.h" -#include "device_enumerator_udev.h" +#include "libcamera/internal/device_enumerator.h" +#include "libcamera/internal/device_enumerator_sysfs.h" +#include "libcamera/internal/device_enumerator_udev.h" #include -#include "log.h" -#include "media_device.h" +#include "libcamera/internal/log.h" +#include "libcamera/internal/media_device.h" /** * \file device_enumerator.h diff --git a/src/libcamera/device_enumerator_sysfs.cpp b/src/libcamera/device_enumerator_sysfs.cpp index 3446db59e..ff7288528 100644 --- a/src/libcamera/device_enumerator_sysfs.cpp +++ b/src/libcamera/device_enumerator_sysfs.cpp @@ -5,7 +5,7 @@ * device_enumerator_sysfs.cpp - sysfs-based device enumerator */ -#include "device_enumerator_sysfs.h" +#include "libcamera/internal/device_enumerator_sysfs.h" #include #include @@ -17,8 +17,8 @@ #include #include -#include "log.h" -#include "media_device.h" +#include "libcamera/internal/log.h" +#include "libcamera/internal/media_device.h" namespace libcamera { diff --git a/src/libcamera/device_enumerator_udev.cpp b/src/libcamera/device_enumerator_udev.cpp index 2e33c898a..56ca4dc28 100644 --- a/src/libcamera/device_enumerator_udev.cpp +++ b/src/libcamera/device_enumerator_udev.cpp @@ -5,7 +5,7 @@ * device_enumerator_udev.cpp - udev-based device enumerator */ -#include "device_enumerator_udev.h" +#include "libcamera/internal/device_enumerator_udev.h" #include #include @@ -19,8 +19,8 @@ #include -#include "log.h" -#include "media_device.h" +#include "libcamera/internal/log.h" +#include "libcamera/internal/media_device.h" namespace libcamera { diff --git a/src/libcamera/event_dispatcher.cpp b/src/libcamera/event_dispatcher.cpp index bb4fddfff..90bd5daf0 100644 --- a/src/libcamera/event_dispatcher.cpp +++ b/src/libcamera/event_dispatcher.cpp @@ -7,7 +7,7 @@ #include -#include "log.h" +#include "libcamera/internal/log.h" /** * \file event_dispatcher.h diff --git a/src/libcamera/event_dispatcher_poll.cpp b/src/libcamera/event_dispatcher_poll.cpp index 51ac5adf2..9ab85da7d 100644 --- a/src/libcamera/event_dispatcher_poll.cpp +++ b/src/libcamera/event_dispatcher_poll.cpp @@ -5,7 +5,7 @@ * event_dispatcher_poll.cpp - Poll-based event dispatcher */ -#include "event_dispatcher_poll.h" +#include "libcamera/internal/event_dispatcher_poll.h" #include #include @@ -19,9 +19,9 @@ #include #include -#include "log.h" -#include "thread.h" -#include "utils.h" +#include "libcamera/internal/log.h" +#include "libcamera/internal/thread.h" +#include "libcamera/internal/utils.h" /** * \file event_dispatcher_poll.h diff --git a/src/libcamera/event_notifier.cpp b/src/libcamera/event_notifier.cpp index a9be686f7..cc3ea0d91 100644 --- a/src/libcamera/event_notifier.cpp +++ b/src/libcamera/event_notifier.cpp @@ -10,8 +10,8 @@ #include #include -#include "message.h" -#include "thread.h" +#include "libcamera/internal/message.h" +#include "libcamera/internal/thread.h" /** * \file event_notifier.h diff --git a/src/libcamera/file.cpp b/src/libcamera/file.cpp index 8223743d5..c471bde3f 100644 --- a/src/libcamera/file.cpp +++ b/src/libcamera/file.cpp @@ -5,7 +5,7 @@ * file.cpp - File I/O operations */ -#include "file.h" +#include "libcamera/internal/file.h" #include #include @@ -14,7 +14,7 @@ #include #include -#include "log.h" +#include "libcamera/internal/log.h" /** * \file file.h diff --git a/src/libcamera/file_descriptor.cpp b/src/libcamera/file_descriptor.cpp index 88385476d..ee60064bc 100644 --- a/src/libcamera/file_descriptor.cpp +++ b/src/libcamera/file_descriptor.cpp @@ -11,7 +11,7 @@ #include #include -#include "log.h" +#include "libcamera/internal/log.h" /** * \file file_descriptor.h diff --git a/src/libcamera/formats.cpp b/src/libcamera/formats.cpp index b3af0f7fc..2ac3b412e 100644 --- a/src/libcamera/formats.cpp +++ b/src/libcamera/formats.cpp @@ -5,11 +5,11 @@ * formats.cpp - libcamera image formats */ -#include "formats.h" +#include "libcamera/internal/formats.h" #include -#include "log.h" +#include "libcamera/internal/log.h" /** * \file formats.h diff --git a/src/libcamera/framebuffer_allocator.cpp b/src/libcamera/framebuffer_allocator.cpp index a37b564c6..252191ba2 100644 --- a/src/libcamera/framebuffer_allocator.cpp +++ b/src/libcamera/framebuffer_allocator.cpp @@ -13,8 +13,8 @@ #include #include -#include "log.h" -#include "pipeline_handler.h" +#include "libcamera/internal/log.h" +#include "libcamera/internal/pipeline_handler.h" /** * \file framebuffer_allocator.h diff --git a/src/libcamera/ipa_context_wrapper.cpp b/src/libcamera/ipa_context_wrapper.cpp index 0bd3a1aec..bcdc55c2b 100644 --- a/src/libcamera/ipa_context_wrapper.cpp +++ b/src/libcamera/ipa_context_wrapper.cpp @@ -5,15 +5,15 @@ * ipa_context_wrapper.cpp - Image Processing Algorithm context wrapper */ -#include "ipa_context_wrapper.h" +#include "libcamera/internal/ipa_context_wrapper.h" #include #include -#include "byte_stream_buffer.h" -#include "camera_sensor.h" -#include "utils.h" +#include "libcamera/internal/byte_stream_buffer.h" +#include "libcamera/internal/camera_sensor.h" +#include "libcamera/internal/utils.h" /** * \file ipa_context_wrapper.h diff --git a/src/libcamera/ipa_manager.cpp b/src/libcamera/ipa_manager.cpp index 1faa3dd38..505cf6107 100644 --- a/src/libcamera/ipa_manager.cpp +++ b/src/libcamera/ipa_manager.cpp @@ -5,19 +5,19 @@ * ipa_manager.cpp - Image Processing Algorithm module manager */ -#include "ipa_manager.h" +#include "libcamera/internal/ipa_manager.h" #include #include #include #include -#include "file.h" -#include "ipa_module.h" -#include "ipa_proxy.h" -#include "log.h" -#include "pipeline_handler.h" -#include "utils.h" +#include "libcamera/internal/file.h" +#include "libcamera/internal/ipa_module.h" +#include "libcamera/internal/ipa_proxy.h" +#include "libcamera/internal/log.h" +#include "libcamera/internal/pipeline_handler.h" +#include "libcamera/internal/utils.h" /** * \file ipa_manager.h diff --git a/src/libcamera/ipa_module.cpp b/src/libcamera/ipa_module.cpp index 3444a788b..91534b61e 100644 --- a/src/libcamera/ipa_module.cpp +++ b/src/libcamera/ipa_module.cpp @@ -5,7 +5,7 @@ * ipa_module.cpp - Image Processing Algorithm module */ -#include "ipa_module.h" +#include "libcamera/internal/ipa_module.h" #include #include @@ -23,10 +23,10 @@ #include -#include "file.h" -#include "log.h" -#include "pipeline_handler.h" -#include "utils.h" +#include "libcamera/internal/file.h" +#include "libcamera/internal/log.h" +#include "libcamera/internal/pipeline_handler.h" +#include "libcamera/internal/utils.h" /** * \file ipa_module.h diff --git a/src/libcamera/ipa_proxy.cpp b/src/libcamera/ipa_proxy.cpp index 401ac52d3..23be24ad9 100644 --- a/src/libcamera/ipa_proxy.cpp +++ b/src/libcamera/ipa_proxy.cpp @@ -5,16 +5,16 @@ * ipa_proxy.cpp - Image Processing Algorithm proxy */ -#include "ipa_proxy.h" +#include "libcamera/internal/ipa_proxy.h" #include #include #include #include -#include "ipa_module.h" -#include "log.h" -#include "utils.h" +#include "libcamera/internal/ipa_module.h" +#include "libcamera/internal/log.h" +#include "libcamera/internal/utils.h" /** * \file ipa_proxy.h diff --git a/src/libcamera/ipa_pub_key.cpp.in b/src/libcamera/ipa_pub_key.cpp.in index 7ffc1e24d..01e5333b4 100644 --- a/src/libcamera/ipa_pub_key.cpp.in +++ b/src/libcamera/ipa_pub_key.cpp.in @@ -7,7 +7,7 @@ * This file is auto-generated. Do not edit. */ -#include "ipa_manager.h" +#include "libcamera/internal/ipa_manager.h" namespace libcamera { diff --git a/src/libcamera/ipc_unixsocket.cpp b/src/libcamera/ipc_unixsocket.cpp index 6e5cab894..7df86e885 100644 --- a/src/libcamera/ipc_unixsocket.cpp +++ b/src/libcamera/ipc_unixsocket.cpp @@ -5,14 +5,14 @@ * ipc_unixsocket.cpp - IPC mechanism based on Unix sockets */ -#include "ipc_unixsocket.h" +#include "libcamera/internal/ipc_unixsocket.h" #include #include #include #include -#include "log.h" +#include "libcamera/internal/log.h" /** * \file ipc_unixsocket.h diff --git a/src/libcamera/log.cpp b/src/libcamera/log.cpp index fd1b5c39a..180eb97ba 100644 --- a/src/libcamera/log.cpp +++ b/src/libcamera/log.cpp @@ -5,7 +5,7 @@ * log.cpp - Logging infrastructure */ -#include "log.h" +#include "libcamera/internal/log.h" #if HAVE_BACKTRACE #include @@ -22,8 +22,8 @@ #include -#include "thread.h" -#include "utils.h" +#include "libcamera/internal/thread.h" +#include "libcamera/internal/utils.h" /** * \file log.h diff --git a/src/libcamera/media_device.cpp b/src/libcamera/media_device.cpp index d4e7e1002..de18d572f 100644 --- a/src/libcamera/media_device.cpp +++ b/src/libcamera/media_device.cpp @@ -5,7 +5,7 @@ * media_device.cpp - Media device handler */ -#include "media_device.h" +#include "libcamera/internal/media_device.h" #include #include @@ -18,7 +18,7 @@ #include -#include "log.h" +#include "libcamera/internal/log.h" /** * \file media_device.h diff --git a/src/libcamera/media_object.cpp b/src/libcamera/media_object.cpp index ef32065c1..ce77a7271 100644 --- a/src/libcamera/media_object.cpp +++ b/src/libcamera/media_object.cpp @@ -5,7 +5,7 @@ * media_object.cpp - Media device objects: entities, pads and links */ -#include "media_object.h" +#include "libcamera/internal/media_object.h" #include #include @@ -15,8 +15,8 @@ #include -#include "log.h" -#include "media_device.h" +#include "libcamera/internal/log.h" +#include "libcamera/internal/media_device.h" /** * \file media_object.h diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build index d42e9720d..472af451c 100644 --- a/src/libcamera/meson.build +++ b/src/libcamera/meson.build @@ -51,13 +51,8 @@ libcamera_sources = files([ 'v4l2_videodevice.cpp', ]) -subdir('include') - -libcamera_internal_includes = include_directories('include') - includes = [ libcamera_includes, - libcamera_internal_includes, ] subdir('pipeline') diff --git a/src/libcamera/message.cpp b/src/libcamera/message.cpp index 77f2bdd5f..e9b3e73f3 100644 --- a/src/libcamera/message.cpp +++ b/src/libcamera/message.cpp @@ -5,11 +5,11 @@ * message.cpp - Message queue support */ -#include "message.h" +#include "libcamera/internal/message.h" #include -#include "log.h" +#include "libcamera/internal/log.h" /** * \file message.h diff --git a/src/libcamera/object.cpp b/src/libcamera/object.cpp index 99c3bf9a7..1544a23e4 100644 --- a/src/libcamera/object.cpp +++ b/src/libcamera/object.cpp @@ -11,11 +11,11 @@ #include -#include "log.h" -#include "message.h" -#include "semaphore.h" -#include "thread.h" -#include "utils.h" +#include "libcamera/internal/log.h" +#include "libcamera/internal/message.h" +#include "libcamera/internal/semaphore.h" +#include "libcamera/internal/thread.h" +#include "libcamera/internal/utils.h" /** * \file object.h diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp index 1988cb0ee..b805fea71 100644 --- a/src/libcamera/pipeline/ipu3/ipu3.cpp +++ b/src/libcamera/pipeline/ipu3/ipu3.cpp @@ -17,15 +17,15 @@ #include #include -#include "camera_sensor.h" -#include "device_enumerator.h" -#include "log.h" -#include "media_device.h" -#include "pipeline_handler.h" -#include "utils.h" -#include "v4l2_controls.h" -#include "v4l2_subdevice.h" -#include "v4l2_videodevice.h" +#include "libcamera/internal/camera_sensor.h" +#include "libcamera/internal/device_enumerator.h" +#include "libcamera/internal/log.h" +#include "libcamera/internal/media_device.h" +#include "libcamera/internal/pipeline_handler.h" +#include "libcamera/internal/utils.h" +#include "libcamera/internal/v4l2_controls.h" +#include "libcamera/internal/v4l2_subdevice.h" +#include "libcamera/internal/v4l2_videodevice.h" namespace libcamera { diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp index 41d1a522f..e254e5558 100644 --- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp +++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp @@ -21,15 +21,16 @@ #include #include -#include "camera_sensor.h" -#include "device_enumerator.h" -#include "ipa_manager.h" -#include "media_device.h" -#include "pipeline_handler.h" +#include "libcamera/internal/camera_sensor.h" +#include "libcamera/internal/device_enumerator.h" +#include "libcamera/internal/ipa_manager.h" +#include "libcamera/internal/media_device.h" +#include "libcamera/internal/pipeline_handler.h" +#include "libcamera/internal/utils.h" +#include "libcamera/internal/v4l2_controls.h" +#include "libcamera/internal/v4l2_videodevice.h" + #include "staggered_ctrl.h" -#include "utils.h" -#include "v4l2_controls.h" -#include "v4l2_videodevice.h" #include "vcsm.h" namespace libcamera { diff --git a/src/libcamera/pipeline/raspberrypi/staggered_ctrl.cpp b/src/libcamera/pipeline/raspberrypi/staggered_ctrl.cpp index d431887ea..391e13f54 100644 --- a/src/libcamera/pipeline/raspberrypi/staggered_ctrl.cpp +++ b/src/libcamera/pipeline/raspberrypi/staggered_ctrl.cpp @@ -11,9 +11,9 @@ #include -#include "log.h" -#include "utils.h" -#include "v4l2_videodevice.h" +#include "libcamera/internal/log.h" +#include "libcamera/internal/utils.h" +#include "libcamera/internal/v4l2_videodevice.h" namespace libcamera { diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp index 1e81a0048..7a0c8771b 100644 --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp @@ -20,16 +20,17 @@ #include #include -#include "camera_sensor.h" -#include "device_enumerator.h" -#include "ipa_manager.h" -#include "log.h" -#include "media_device.h" -#include "pipeline_handler.h" +#include "libcamera/internal/camera_sensor.h" +#include "libcamera/internal/device_enumerator.h" +#include "libcamera/internal/ipa_manager.h" +#include "libcamera/internal/log.h" +#include "libcamera/internal/media_device.h" +#include "libcamera/internal/pipeline_handler.h" +#include "libcamera/internal/utils.h" +#include "libcamera/internal/v4l2_subdevice.h" +#include "libcamera/internal/v4l2_videodevice.h" + #include "timeline.h" -#include "utils.h" -#include "v4l2_subdevice.h" -#include "v4l2_videodevice.h" namespace libcamera { diff --git a/src/libcamera/pipeline/rkisp1/timeline.cpp b/src/libcamera/pipeline/rkisp1/timeline.cpp index f6c6434d7..f5194608c 100644 --- a/src/libcamera/pipeline/rkisp1/timeline.cpp +++ b/src/libcamera/pipeline/rkisp1/timeline.cpp @@ -7,7 +7,7 @@ #include "timeline.h" -#include "log.h" +#include "libcamera/internal/log.h" /** * \file timeline.h diff --git a/src/libcamera/pipeline/rkisp1/timeline.h b/src/libcamera/pipeline/rkisp1/timeline.h index 9d30e4eaf..88f993298 100644 --- a/src/libcamera/pipeline/rkisp1/timeline.h +++ b/src/libcamera/pipeline/rkisp1/timeline.h @@ -12,7 +12,7 @@ #include -#include "utils.h" +#include "libcamera/internal/utils.h" namespace libcamera { diff --git a/src/libcamera/pipeline/simple/converter.cpp b/src/libcamera/pipeline/simple/converter.cpp index 6d88776dc..02443e7f7 100644 --- a/src/libcamera/pipeline/simple/converter.cpp +++ b/src/libcamera/pipeline/simple/converter.cpp @@ -13,9 +13,9 @@ #include #include -#include "log.h" -#include "media_device.h" -#include "v4l2_videodevice.h" +#include "libcamera/internal/log.h" +#include "libcamera/internal/media_device.h" +#include "libcamera/internal/v4l2_videodevice.h" namespace libcamera { diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp index 667360615..256519008 100644 --- a/src/libcamera/pipeline/simple/simple.cpp +++ b/src/libcamera/pipeline/simple/simple.cpp @@ -24,13 +24,13 @@ #include #include -#include "camera_sensor.h" -#include "device_enumerator.h" -#include "log.h" -#include "media_device.h" -#include "pipeline_handler.h" -#include "v4l2_subdevice.h" -#include "v4l2_videodevice.h" +#include "libcamera/internal/camera_sensor.h" +#include "libcamera/internal/device_enumerator.h" +#include "libcamera/internal/log.h" +#include "libcamera/internal/media_device.h" +#include "libcamera/internal/pipeline_handler.h" +#include "libcamera/internal/v4l2_subdevice.h" +#include "libcamera/internal/v4l2_videodevice.h" #include "converter.h" diff --git a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp index f0c1337de..a07490949 100644 --- a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp +++ b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp @@ -17,13 +17,13 @@ #include #include -#include "device_enumerator.h" -#include "log.h" -#include "media_device.h" -#include "pipeline_handler.h" -#include "utils.h" -#include "v4l2_controls.h" -#include "v4l2_videodevice.h" +#include "libcamera/internal/device_enumerator.h" +#include "libcamera/internal/log.h" +#include "libcamera/internal/media_device.h" +#include "libcamera/internal/pipeline_handler.h" +#include "libcamera/internal/utils.h" +#include "libcamera/internal/v4l2_controls.h" +#include "libcamera/internal/v4l2_videodevice.h" namespace libcamera { diff --git a/src/libcamera/pipeline/vimc/vimc.cpp b/src/libcamera/pipeline/vimc/vimc.cpp index 128301e3d..50a9f2df4 100644 --- a/src/libcamera/pipeline/vimc/vimc.cpp +++ b/src/libcamera/pipeline/vimc/vimc.cpp @@ -22,16 +22,16 @@ #include #include -#include "camera_sensor.h" -#include "device_enumerator.h" -#include "ipa_manager.h" -#include "log.h" -#include "media_device.h" -#include "pipeline_handler.h" -#include "utils.h" -#include "v4l2_controls.h" -#include "v4l2_subdevice.h" -#include "v4l2_videodevice.h" +#include "libcamera/internal/camera_sensor.h" +#include "libcamera/internal/device_enumerator.h" +#include "libcamera/internal/ipa_manager.h" +#include "libcamera/internal/log.h" +#include "libcamera/internal/media_device.h" +#include "libcamera/internal/pipeline_handler.h" +#include "libcamera/internal/utils.h" +#include "libcamera/internal/v4l2_controls.h" +#include "libcamera/internal/v4l2_subdevice.h" +#include "libcamera/internal/v4l2_videodevice.h" namespace libcamera { diff --git a/src/libcamera/pipeline_handler.cpp b/src/libcamera/pipeline_handler.cpp index 254d341fb..53aeebdcc 100644 --- a/src/libcamera/pipeline_handler.cpp +++ b/src/libcamera/pipeline_handler.cpp @@ -5,7 +5,7 @@ * pipeline_handler.cpp - Pipeline handler infrastructure */ -#include "pipeline_handler.h" +#include "libcamera/internal/pipeline_handler.h" #include @@ -13,10 +13,10 @@ #include #include -#include "device_enumerator.h" -#include "log.h" -#include "media_device.h" -#include "utils.h" +#include "libcamera/internal/device_enumerator.h" +#include "libcamera/internal/log.h" +#include "libcamera/internal/media_device.h" +#include "libcamera/internal/utils.h" /** * \file pipeline_handler.h diff --git a/src/libcamera/process.cpp b/src/libcamera/process.cpp index 3b4d0f10d..e816ee867 100644 --- a/src/libcamera/process.cpp +++ b/src/libcamera/process.cpp @@ -5,7 +5,7 @@ * process.cpp - Process object */ -#include "process.h" +#include "libcamera/internal/process.h" #include #include @@ -22,8 +22,8 @@ #include -#include "log.h" -#include "utils.h" +#include "libcamera/internal/log.h" +#include "libcamera/internal/utils.h" /** * \file process.h diff --git a/src/libcamera/proxy/ipa_proxy_linux.cpp b/src/libcamera/proxy/ipa_proxy_linux.cpp index 9e0f44cf3..7d6f8799f 100644 --- a/src/libcamera/proxy/ipa_proxy_linux.cpp +++ b/src/libcamera/proxy/ipa_proxy_linux.cpp @@ -10,11 +10,11 @@ #include #include -#include "ipa_module.h" -#include "ipa_proxy.h" -#include "ipc_unixsocket.h" -#include "log.h" -#include "process.h" +#include "libcamera/internal/ipa_module.h" +#include "libcamera/internal/ipa_proxy.h" +#include "libcamera/internal/ipc_unixsocket.h" +#include "libcamera/internal/log.h" +#include "libcamera/internal/process.h" namespace libcamera { diff --git a/src/libcamera/proxy/ipa_proxy_thread.cpp b/src/libcamera/proxy/ipa_proxy_thread.cpp index 81d2d68ee..03d4c0d92 100644 --- a/src/libcamera/proxy/ipa_proxy_thread.cpp +++ b/src/libcamera/proxy/ipa_proxy_thread.cpp @@ -10,11 +10,11 @@ #include #include -#include "ipa_context_wrapper.h" -#include "ipa_module.h" -#include "ipa_proxy.h" -#include "log.h" -#include "thread.h" +#include "libcamera/internal/ipa_context_wrapper.h" +#include "libcamera/internal/ipa_module.h" +#include "libcamera/internal/ipa_proxy.h" +#include "libcamera/internal/log.h" +#include "libcamera/internal/thread.h" namespace libcamera { diff --git a/src/libcamera/proxy/worker/ipa_proxy_linux_worker.cpp b/src/libcamera/proxy/worker/ipa_proxy_linux_worker.cpp index 9cefa2405..9ba94d01d 100644 --- a/src/libcamera/proxy/worker/ipa_proxy_linux_worker.cpp +++ b/src/libcamera/proxy/worker/ipa_proxy_linux_worker.cpp @@ -13,10 +13,10 @@ #include #include -#include "ipa_module.h" -#include "ipc_unixsocket.h" -#include "log.h" -#include "thread.h" +#include "libcamera/internal/ipa_module.h" +#include "libcamera/internal/ipc_unixsocket.h" +#include "libcamera/internal/log.h" +#include "libcamera/internal/thread.h" using namespace libcamera; diff --git a/src/libcamera/proxy/worker/meson.build b/src/libcamera/proxy/worker/meson.build index 1b1bee5e0..ac0310a74 100644 --- a/src/libcamera/proxy/worker/meson.build +++ b/src/libcamera/proxy/worker/meson.build @@ -8,7 +8,6 @@ proxy_install_dir = join_paths(get_option('libexecdir'), 'libcamera') foreach t : ipa_proxy_sources proxy = executable(t[0], t[1], - include_directories : libcamera_internal_includes, install : true, install_dir : proxy_install_dir, dependencies : libcamera_dep) diff --git a/src/libcamera/pub_key.cpp b/src/libcamera/pub_key.cpp index 064d2dd20..2f60adbb7 100644 --- a/src/libcamera/pub_key.cpp +++ b/src/libcamera/pub_key.cpp @@ -5,7 +5,7 @@ * pub_key.cpp - Public key signature verification */ -#include "pub_key.h" +#include "libcamera/internal/pub_key.h" #if HAVE_GNUTLS #include diff --git a/src/libcamera/request.cpp b/src/libcamera/request.cpp index ea33736fb..6b9e0b4a5 100644 --- a/src/libcamera/request.cpp +++ b/src/libcamera/request.cpp @@ -14,8 +14,8 @@ #include #include -#include "camera_controls.h" -#include "log.h" +#include "libcamera/internal/camera_controls.h" +#include "libcamera/internal/log.h" /** * \file request.h diff --git a/src/libcamera/semaphore.cpp b/src/libcamera/semaphore.cpp index ce1eae491..d8988a918 100644 --- a/src/libcamera/semaphore.cpp +++ b/src/libcamera/semaphore.cpp @@ -5,8 +5,8 @@ * semaphore.cpp - General-purpose counting semaphore */ -#include "semaphore.h" -#include "thread.h" +#include "libcamera/internal/semaphore.h" +#include "libcamera/internal/thread.h" /** * \file semaphore.h diff --git a/src/libcamera/signal.cpp b/src/libcamera/signal.cpp index 6eab1fa74..2532df3c3 100644 --- a/src/libcamera/signal.cpp +++ b/src/libcamera/signal.cpp @@ -7,7 +7,7 @@ #include -#include "thread.h" +#include "libcamera/internal/thread.h" /** * \file signal.h diff --git a/src/libcamera/stream.cpp b/src/libcamera/stream.cpp index 86c0b17db..f34348f2a 100644 --- a/src/libcamera/stream.cpp +++ b/src/libcamera/stream.cpp @@ -15,8 +15,8 @@ #include -#include "log.h" -#include "utils.h" +#include "libcamera/internal/log.h" +#include "libcamera/internal/utils.h" /** * \file stream.h diff --git a/src/libcamera/thread.cpp b/src/libcamera/thread.cpp index 85293c188..d1750d72e 100644 --- a/src/libcamera/thread.cpp +++ b/src/libcamera/thread.cpp @@ -5,7 +5,7 @@ * thread.cpp - Thread support */ -#include "thread.h" +#include "libcamera/internal/thread.h" #include #include @@ -16,9 +16,9 @@ #include -#include "event_dispatcher_poll.h" -#include "log.h" -#include "message.h" +#include "libcamera/internal/event_dispatcher_poll.h" +#include "libcamera/internal/log.h" +#include "libcamera/internal/message.h" /** * \page thread Thread Support diff --git a/src/libcamera/timer.cpp b/src/libcamera/timer.cpp index 24da51524..24e452eda 100644 --- a/src/libcamera/timer.cpp +++ b/src/libcamera/timer.cpp @@ -12,10 +12,10 @@ #include #include -#include "log.h" -#include "message.h" -#include "thread.h" -#include "utils.h" +#include "libcamera/internal/log.h" +#include "libcamera/internal/message.h" +#include "libcamera/internal/thread.h" +#include "libcamera/internal/utils.h" /** * \file timer.h diff --git a/src/libcamera/utils.cpp b/src/libcamera/utils.cpp index fbadf3509..d55338fe6 100644 --- a/src/libcamera/utils.cpp +++ b/src/libcamera/utils.cpp @@ -5,7 +5,7 @@ * utils.cpp - Miscellaneous utility functions */ -#include "utils.h" +#include "libcamera/internal/utils.h" #include #include diff --git a/src/libcamera/v4l2_controls.cpp b/src/libcamera/v4l2_controls.cpp index 8e2415f2a..3f8ec6ca0 100644 --- a/src/libcamera/v4l2_controls.cpp +++ b/src/libcamera/v4l2_controls.cpp @@ -5,7 +5,7 @@ * v4l2_controls.cpp - V4L2 Controls Support */ -#include "v4l2_controls.h" +#include "libcamera/internal/v4l2_controls.h" #include diff --git a/src/libcamera/v4l2_device.cpp b/src/libcamera/v4l2_device.cpp index d08ab531f..56ea1ddda 100644 --- a/src/libcamera/v4l2_device.cpp +++ b/src/libcamera/v4l2_device.cpp @@ -5,7 +5,7 @@ * v4l2_device.cpp - Common base for V4L2 video devices and subdevices */ -#include "v4l2_device.h" +#include "libcamera/internal/v4l2_device.h" #include #include @@ -14,9 +14,9 @@ #include #include -#include "log.h" -#include "utils.h" -#include "v4l2_controls.h" +#include "libcamera/internal/log.h" +#include "libcamera/internal/utils.h" +#include "libcamera/internal/v4l2_controls.h" /** * \file v4l2_device.h diff --git a/src/libcamera/v4l2_pixelformat.cpp b/src/libcamera/v4l2_pixelformat.cpp index 561f93277..36776be99 100644 --- a/src/libcamera/v4l2_pixelformat.cpp +++ b/src/libcamera/v4l2_pixelformat.cpp @@ -6,7 +6,7 @@ * v4l2_pixelformat.cpp - V4L2 Pixel Format */ -#include "v4l2_pixelformat.h" +#include "libcamera/internal/v4l2_pixelformat.h" #include #include @@ -16,8 +16,8 @@ #include -#include "formats.h" -#include "log.h" +#include "libcamera/internal/formats.h" +#include "libcamera/internal/log.h" /** * \file v4l2_pixelformat.h diff --git a/src/libcamera/v4l2_subdevice.cpp b/src/libcamera/v4l2_subdevice.cpp index 2b756178f..7aefc1be0 100644 --- a/src/libcamera/v4l2_subdevice.cpp +++ b/src/libcamera/v4l2_subdevice.cpp @@ -5,7 +5,7 @@ * v4l2_subdevice.cpp - V4L2 Subdevice */ -#include "v4l2_subdevice.h" +#include "libcamera/internal/v4l2_subdevice.h" #include #include @@ -19,10 +19,10 @@ #include -#include "log.h" -#include "media_device.h" -#include "media_object.h" -#include "utils.h" +#include "libcamera/internal/log.h" +#include "libcamera/internal/media_device.h" +#include "libcamera/internal/media_object.h" +#include "libcamera/internal/utils.h" /** * \file v4l2_subdevice.h diff --git a/src/libcamera/v4l2_videodevice.cpp b/src/libcamera/v4l2_videodevice.cpp index 4b9f8b5c0..d35596bd4 100644 --- a/src/libcamera/v4l2_videodevice.cpp +++ b/src/libcamera/v4l2_videodevice.cpp @@ -5,7 +5,7 @@ * v4l2_videodevice.cpp - V4L2 Video Device */ -#include "v4l2_videodevice.h" +#include "libcamera/internal/v4l2_videodevice.h" #include #include @@ -23,10 +23,10 @@ #include #include -#include "log.h" -#include "media_device.h" -#include "media_object.h" -#include "utils.h" +#include "libcamera/internal/log.h" +#include "libcamera/internal/media_device.h" +#include "libcamera/internal/media_object.h" +#include "libcamera/internal/utils.h" /** * \file v4l2_videodevice.h diff --git a/src/v4l2/meson.build b/src/v4l2/meson.build index fc1be82d1..0fb941ea9 100644 --- a/src/v4l2/meson.build +++ b/src/v4l2/meson.build @@ -22,6 +22,5 @@ v4l2_compat = shared_library('v4l2-compat', v4l2_compat_sources, name_prefix : '', install : true, - include_directories : libcamera_internal_includes, dependencies : [ libcamera_dep, libdl ], cpp_args : v4l2_compat_cpp_args) diff --git a/src/v4l2/v4l2_camera.cpp b/src/v4l2/v4l2_camera.cpp index ecbb70acf..50a4121cc 100644 --- a/src/v4l2/v4l2_camera.cpp +++ b/src/v4l2/v4l2_camera.cpp @@ -9,7 +9,7 @@ #include -#include "log.h" +#include "libcamera/internal/log.h" using namespace libcamera; diff --git a/src/v4l2/v4l2_camera.h b/src/v4l2/v4l2_camera.h index 130995d95..c969130fb 100644 --- a/src/v4l2/v4l2_camera.h +++ b/src/v4l2/v4l2_camera.h @@ -17,7 +17,7 @@ #include #include -#include "semaphore.h" +#include "libcamera/internal/semaphore.h" using namespace libcamera; diff --git a/src/v4l2/v4l2_camera_proxy.cpp b/src/v4l2/v4l2_camera_proxy.cpp index 47d0528b3..19e8f6d3b 100644 --- a/src/v4l2/v4l2_camera_proxy.cpp +++ b/src/v4l2/v4l2_camera_proxy.cpp @@ -17,8 +17,9 @@ #include #include -#include "log.h" -#include "utils.h" +#include "libcamera/internal/log.h" +#include "libcamera/internal/utils.h" + #include "v4l2_camera.h" #include "v4l2_compat_manager.h" diff --git a/src/v4l2/v4l2_compat_manager.cpp b/src/v4l2/v4l2_compat_manager.cpp index 961d06b3e..cd8ac0b8e 100644 --- a/src/v4l2/v4l2_compat_manager.cpp +++ b/src/v4l2/v4l2_compat_manager.cpp @@ -22,7 +22,7 @@ #include #include -#include "log.h" +#include "libcamera/internal/log.h" using namespace libcamera; diff --git a/test/byte-stream-buffer.cpp b/test/byte-stream-buffer.cpp index bc1d462eb..d606f146f 100644 --- a/test/byte-stream-buffer.cpp +++ b/test/byte-stream-buffer.cpp @@ -8,7 +8,8 @@ #include #include -#include "byte_stream_buffer.h" +#include "libcamera/internal/byte_stream_buffer.h" + #include "test.h" using namespace std; diff --git a/test/camera-sensor.cpp b/test/camera-sensor.cpp index 6069d668e..8c7fd1d2d 100644 --- a/test/camera-sensor.cpp +++ b/test/camera-sensor.cpp @@ -10,11 +10,11 @@ #include -#include "camera_sensor.h" -#include "device_enumerator.h" -#include "media_device.h" -#include "utils.h" -#include "v4l2_subdevice.h" +#include "libcamera/internal/camera_sensor.h" +#include "libcamera/internal/device_enumerator.h" +#include "libcamera/internal/media_device.h" +#include "libcamera/internal/utils.h" +#include "libcamera/internal/v4l2_subdevice.h" #include "test.h" diff --git a/test/camera/buffer_import.cpp b/test/camera/buffer_import.cpp index 3f392cdc0..ad680a83f 100644 --- a/test/camera/buffer_import.cpp +++ b/test/camera/buffer_import.cpp @@ -12,9 +12,9 @@ #include #include -#include "device_enumerator.h" -#include "media_device.h" -#include "v4l2_videodevice.h" +#include "libcamera/internal/device_enumerator.h" +#include "libcamera/internal/media_device.h" +#include "libcamera/internal/v4l2_videodevice.h" #include "buffer_source.h" #include "camera_test.h" diff --git a/test/controls/control_info_map.cpp b/test/controls/control_info_map.cpp index eeb702db0..e4305f132 100644 --- a/test/controls/control_info_map.cpp +++ b/test/controls/control_info_map.cpp @@ -12,7 +12,7 @@ #include #include -#include "camera_controls.h" +#include "libcamera/internal/camera_controls.h" #include "camera_test.h" #include "test.h" diff --git a/test/controls/control_list.cpp b/test/controls/control_list.cpp index d51ec47d6..5c8485b5d 100644 --- a/test/controls/control_list.cpp +++ b/test/controls/control_list.cpp @@ -12,7 +12,7 @@ #include #include -#include "camera_controls.h" +#include "libcamera/internal/camera_controls.h" #include "camera_test.h" #include "test.h" diff --git a/test/event-dispatcher.cpp b/test/event-dispatcher.cpp index 9f9cf1781..1b6177869 100644 --- a/test/event-dispatcher.cpp +++ b/test/event-dispatcher.cpp @@ -13,8 +13,9 @@ #include #include +#include "libcamera/internal/thread.h" + #include "test.h" -#include "thread.h" using namespace std; using namespace libcamera; diff --git a/test/event-thread.cpp b/test/event-thread.cpp index 01120733e..c90e6ac04 100644 --- a/test/event-thread.cpp +++ b/test/event-thread.cpp @@ -13,8 +13,9 @@ #include #include +#include "libcamera/internal/thread.h" + #include "test.h" -#include "thread.h" using namespace std; using namespace libcamera; diff --git a/test/event.cpp b/test/event.cpp index 816060cc4..c865092c7 100644 --- a/test/event.cpp +++ b/test/event.cpp @@ -13,8 +13,9 @@ #include #include +#include "libcamera/internal/thread.h" + #include "test.h" -#include "thread.h" using namespace std; using namespace libcamera; diff --git a/test/file-descriptor.cpp b/test/file-descriptor.cpp index e467f3a71..7477a8435 100644 --- a/test/file-descriptor.cpp +++ b/test/file-descriptor.cpp @@ -13,8 +13,9 @@ #include +#include "libcamera/internal/utils.h" + #include "test.h" -#include "utils.h" using namespace libcamera; using namespace std; diff --git a/test/file.cpp b/test/file.cpp index 655839980..6262a6f04 100644 --- a/test/file.cpp +++ b/test/file.cpp @@ -13,7 +13,8 @@ #include #include -#include "file.h" +#include "libcamera/internal/file.h" + #include "test.h" using namespace std; diff --git a/test/ipa/ipa_interface_test.cpp b/test/ipa/ipa_interface_test.cpp index 7fa88efee..c394377da 100644 --- a/test/ipa/ipa_interface_test.cpp +++ b/test/ipa/ipa_interface_test.cpp @@ -18,12 +18,13 @@ #include -#include "device_enumerator.h" -#include "ipa_manager.h" -#include "ipa_module.h" -#include "pipeline_handler.h" +#include "libcamera/internal/device_enumerator.h" +#include "libcamera/internal/ipa_manager.h" +#include "libcamera/internal/ipa_module.h" +#include "libcamera/internal/pipeline_handler.h" +#include "libcamera/internal/thread.h" + #include "test.h" -#include "thread.h" using namespace std; using namespace libcamera; diff --git a/test/ipa/ipa_module_test.cpp b/test/ipa/ipa_module_test.cpp index e3aee190b..bd5e0e4c7 100644 --- a/test/ipa/ipa_module_test.cpp +++ b/test/ipa/ipa_module_test.cpp @@ -8,7 +8,7 @@ #include #include -#include "ipa_module.h" +#include "libcamera/internal/ipa_module.h" #include "test.h" diff --git a/test/ipa/ipa_wrappers_test.cpp b/test/ipa/ipa_wrappers_test.cpp index 4de132123..aa7a9dcc6 100644 --- a/test/ipa/ipa_wrappers_test.cpp +++ b/test/ipa/ipa_wrappers_test.cpp @@ -15,11 +15,11 @@ #include #include -#include "camera_sensor.h" -#include "device_enumerator.h" -#include "ipa_context_wrapper.h" -#include "media_device.h" -#include "v4l2_subdevice.h" +#include "libcamera/internal/camera_sensor.h" +#include "libcamera/internal/device_enumerator.h" +#include "libcamera/internal/ipa_context_wrapper.h" +#include "libcamera/internal/media_device.h" +#include "libcamera/internal/v4l2_subdevice.h" #include "test.h" diff --git a/test/ipc/unixsocket.cpp b/test/ipc/unixsocket.cpp index f53042b88..4487d27b4 100644 --- a/test/ipc/unixsocket.cpp +++ b/test/ipc/unixsocket.cpp @@ -18,10 +18,11 @@ #include #include -#include "ipc_unixsocket.h" +#include "libcamera/internal/ipc_unixsocket.h" +#include "libcamera/internal/thread.h" +#include "libcamera/internal/utils.h" + #include "test.h" -#include "thread.h" -#include "utils.h" #define CMD_CLOSE 0 #define CMD_REVERSE 1 diff --git a/test/libtest/buffer_source.cpp b/test/libtest/buffer_source.cpp index d1dad2a0f..ee87c8cd8 100644 --- a/test/libtest/buffer_source.cpp +++ b/test/libtest/buffer_source.cpp @@ -10,7 +10,7 @@ #include #include -#include "device_enumerator.h" +#include "libcamera/internal/device_enumerator.h" #include "test.h" diff --git a/test/libtest/buffer_source.h b/test/libtest/buffer_source.h index ae0879c99..95a82a822 100644 --- a/test/libtest/buffer_source.h +++ b/test/libtest/buffer_source.h @@ -9,8 +9,8 @@ #include -#include "media_device.h" -#include "v4l2_videodevice.h" +#include "libcamera/internal/media_device.h" +#include "libcamera/internal/v4l2_videodevice.h" using namespace libcamera; diff --git a/test/libtest/meson.build b/test/libtest/meson.build index 481f6d6ba..542335ea5 100644 --- a/test/libtest/meson.build +++ b/test/libtest/meson.build @@ -15,7 +15,6 @@ test_includes_public = [ test_includes_internal = [ test_includes_public, - libcamera_internal_includes, ] libtest = static_library('libtest', libtest_sources, diff --git a/test/log/log_api.cpp b/test/log/log_api.cpp index 33622f841..6f3248a79 100644 --- a/test/log/log_api.cpp +++ b/test/log/log_api.cpp @@ -18,7 +18,8 @@ #include -#include "log.h" +#include "libcamera/internal/log.h" + #include "test.h" using namespace std; diff --git a/test/log/log_process.cpp b/test/log/log_process.cpp index 2df4aa437..8463d0ede 100644 --- a/test/log/log_process.cpp +++ b/test/log/log_process.cpp @@ -18,11 +18,12 @@ #include #include -#include "log.h" -#include "process.h" +#include "libcamera/internal/log.h" +#include "libcamera/internal/process.h" +#include "libcamera/internal/thread.h" +#include "libcamera/internal/utils.h" + #include "test.h" -#include "thread.h" -#include "utils.h" using namespace std; using namespace libcamera; diff --git a/test/media_device/media_device_print_test.cpp b/test/media_device/media_device_print_test.cpp index 5018906c7..1f5e3f3e8 100644 --- a/test/media_device/media_device_print_test.cpp +++ b/test/media_device/media_device_print_test.cpp @@ -10,7 +10,7 @@ #include #include -#include "media_device.h" +#include "libcamera/internal/media_device.h" #include "test.h" diff --git a/test/media_device/media_device_test.h b/test/media_device/media_device_test.h index cdbd14841..0c8bf9f25 100644 --- a/test/media_device/media_device_test.h +++ b/test/media_device/media_device_test.h @@ -9,8 +9,8 @@ #include -#include "device_enumerator.h" -#include "media_device.h" +#include "libcamera/internal/device_enumerator.h" +#include "libcamera/internal/media_device.h" #include "test.h" diff --git a/test/message.cpp b/test/message.cpp index 478bc79df..9553ba8cb 100644 --- a/test/message.cpp +++ b/test/message.cpp @@ -9,8 +9,9 @@ #include #include -#include "message.h" -#include "thread.h" +#include "libcamera/internal/message.h" +#include "libcamera/internal/thread.h" + #include "test.h" using namespace std; diff --git a/test/object-invoke.cpp b/test/object-invoke.cpp index fa162c838..1ae11bb11 100644 --- a/test/object-invoke.cpp +++ b/test/object-invoke.cpp @@ -11,8 +11,9 @@ #include #include +#include "libcamera/internal/thread.h" + #include "test.h" -#include "thread.h" using namespace std; using namespace libcamera; diff --git a/test/object.cpp b/test/object.cpp index 16118971c..264659b40 100644 --- a/test/object.cpp +++ b/test/object.cpp @@ -9,8 +9,8 @@ #include -#include "message.h" -#include "thread.h" +#include "libcamera/internal/message.h" +#include "libcamera/internal/thread.h" #include "test.h" diff --git a/test/pipeline/ipu3/ipu3_pipeline_test.cpp b/test/pipeline/ipu3/ipu3_pipeline_test.cpp index a5c6be095..34998f8f6 100644 --- a/test/pipeline/ipu3/ipu3_pipeline_test.cpp +++ b/test/pipeline/ipu3/ipu3_pipeline_test.cpp @@ -13,9 +13,10 @@ #include #include -#include "device_enumerator.h" -#include "media_device.h" -#include "media_object.h" +#include "libcamera/internal/device_enumerator.h" +#include "libcamera/internal/media_device.h" +#include "libcamera/internal/media_object.h" + #include "test.h" using namespace std; diff --git a/test/pipeline/rkisp1/rkisp1_pipeline_test.cpp b/test/pipeline/rkisp1/rkisp1_pipeline_test.cpp index d46c928fb..b6678ce76 100644 --- a/test/pipeline/rkisp1/rkisp1_pipeline_test.cpp +++ b/test/pipeline/rkisp1/rkisp1_pipeline_test.cpp @@ -16,9 +16,10 @@ #include #include -#include "device_enumerator.h" -#include "media_device.h" -#include "media_object.h" +#include "libcamera/internal/device_enumerator.h" +#include "libcamera/internal/media_device.h" +#include "libcamera/internal/media_object.h" + #include "test.h" using namespace std; diff --git a/test/process/process_test.cpp b/test/process/process_test.cpp index 7e7b3c2c8..ce0cc7c97 100644 --- a/test/process/process_test.cpp +++ b/test/process/process_test.cpp @@ -12,10 +12,11 @@ #include #include -#include "process.h" +#include "libcamera/internal/process.h" +#include "libcamera/internal/thread.h" +#include "libcamera/internal/utils.h" + #include "test.h" -#include "thread.h" -#include "utils.h" using namespace std; using namespace libcamera; diff --git a/test/serialization/control_serialization.cpp b/test/serialization/control_serialization.cpp index 111365241..e23383d13 100644 --- a/test/serialization/control_serialization.cpp +++ b/test/serialization/control_serialization.cpp @@ -11,8 +11,9 @@ #include #include -#include "byte_stream_buffer.h" -#include "control_serializer.h" +#include "libcamera/internal/byte_stream_buffer.h" +#include "libcamera/internal/control_serializer.h" + #include "serialization_test.h" #include "test.h" diff --git a/test/signal-threads.cpp b/test/signal-threads.cpp index f77733ebc..3c5f3792e 100644 --- a/test/signal-threads.cpp +++ b/test/signal-threads.cpp @@ -9,10 +9,11 @@ #include #include -#include "message.h" -#include "thread.h" +#include "libcamera/internal/message.h" +#include "libcamera/internal/thread.h" +#include "libcamera/internal/utils.h" + #include "test.h" -#include "utils.h" using namespace std; using namespace libcamera; diff --git a/test/threads.cpp b/test/threads.cpp index 0454761de..b4b8d913c 100644 --- a/test/threads.cpp +++ b/test/threads.cpp @@ -9,7 +9,8 @@ #include #include -#include "thread.h" +#include "libcamera/internal/thread.h" + #include "test.h" using namespace std; diff --git a/test/timer-thread.cpp b/test/timer-thread.cpp index 32853b4e8..2f901787f 100644 --- a/test/timer-thread.cpp +++ b/test/timer-thread.cpp @@ -11,8 +11,9 @@ #include #include +#include "libcamera/internal/thread.h" + #include "test.h" -#include "thread.h" using namespace std; using namespace libcamera; diff --git a/test/timer.cpp b/test/timer.cpp index 2bdb006ed..7d5b93c37 100644 --- a/test/timer.cpp +++ b/test/timer.cpp @@ -11,8 +11,9 @@ #include #include +#include "libcamera/internal/thread.h" + #include "test.h" -#include "thread.h" using namespace std; using namespace libcamera; diff --git a/test/utils.cpp b/test/utils.cpp index 55ce9365a..66b91f120 100644 --- a/test/utils.cpp +++ b/test/utils.cpp @@ -12,8 +12,9 @@ #include +#include "libcamera/internal/utils.h" + #include "test.h" -#include "utils.h" using namespace std; using namespace libcamera; diff --git a/test/v4l2_subdevice/list_formats.cpp b/test/v4l2_subdevice/list_formats.cpp index 067dc5ed3..25503c333 100644 --- a/test/v4l2_subdevice/list_formats.cpp +++ b/test/v4l2_subdevice/list_formats.cpp @@ -11,7 +11,8 @@ #include -#include "v4l2_subdevice.h" +#include "libcamera/internal/v4l2_subdevice.h" + #include "v4l2_subdevice_test.h" using namespace std; diff --git a/test/v4l2_subdevice/test_formats.cpp b/test/v4l2_subdevice/test_formats.cpp index 5cf5d5664..9635c9948 100644 --- a/test/v4l2_subdevice/test_formats.cpp +++ b/test/v4l2_subdevice/test_formats.cpp @@ -8,7 +8,8 @@ #include #include -#include "v4l2_subdevice.h" +#include "libcamera/internal/v4l2_subdevice.h" + #include "v4l2_subdevice_test.h" using namespace std; diff --git a/test/v4l2_subdevice/v4l2_subdevice_test.cpp b/test/v4l2_subdevice/v4l2_subdevice_test.cpp index 562a638cb..d8fbfd9f6 100644 --- a/test/v4l2_subdevice/v4l2_subdevice_test.cpp +++ b/test/v4l2_subdevice/v4l2_subdevice_test.cpp @@ -9,9 +9,10 @@ #include #include -#include "device_enumerator.h" -#include "media_device.h" -#include "v4l2_subdevice.h" +#include "libcamera/internal/device_enumerator.h" +#include "libcamera/internal/media_device.h" +#include "libcamera/internal/v4l2_subdevice.h" + #include "v4l2_subdevice_test.h" using namespace std; diff --git a/test/v4l2_subdevice/v4l2_subdevice_test.h b/test/v4l2_subdevice/v4l2_subdevice_test.h index 3bce6691f..00c6399d3 100644 --- a/test/v4l2_subdevice/v4l2_subdevice_test.h +++ b/test/v4l2_subdevice/v4l2_subdevice_test.h @@ -10,10 +10,11 @@ #include -#include "device_enumerator.h" -#include "media_device.h" +#include "libcamera/internal/device_enumerator.h" +#include "libcamera/internal/media_device.h" +#include "libcamera/internal/v4l2_subdevice.h" + #include "test.h" -#include "v4l2_subdevice.h" using namespace libcamera; diff --git a/test/v4l2_videodevice/buffer_sharing.cpp b/test/v4l2_videodevice/buffer_sharing.cpp index 14d3055ad..ba2cc40d7 100644 --- a/test/v4l2_videodevice/buffer_sharing.cpp +++ b/test/v4l2_videodevice/buffer_sharing.cpp @@ -16,7 +16,8 @@ #include #include -#include "thread.h" +#include "libcamera/internal/thread.h" + #include "v4l2_videodevice_test.h" class BufferSharingTest : public V4L2VideoDeviceTest diff --git a/test/v4l2_videodevice/capture_async.cpp b/test/v4l2_videodevice/capture_async.cpp index b38aabc62..13cbcc80b 100644 --- a/test/v4l2_videodevice/capture_async.cpp +++ b/test/v4l2_videodevice/capture_async.cpp @@ -11,7 +11,8 @@ #include #include -#include "thread.h" +#include "libcamera/internal/thread.h" + #include "v4l2_videodevice_test.h" class CaptureAsyncTest : public V4L2VideoDeviceTest diff --git a/test/v4l2_videodevice/controls.cpp b/test/v4l2_videodevice/controls.cpp index 347af2112..9f09d036e 100644 --- a/test/v4l2_videodevice/controls.cpp +++ b/test/v4l2_videodevice/controls.cpp @@ -10,7 +10,7 @@ #include #include -#include "v4l2_videodevice.h" +#include "libcamera/internal/v4l2_videodevice.h" #include "v4l2_videodevice_test.h" diff --git a/test/v4l2_videodevice/formats.cpp b/test/v4l2_videodevice/formats.cpp index a74214215..043732dca 100644 --- a/test/v4l2_videodevice/formats.cpp +++ b/test/v4l2_videodevice/formats.cpp @@ -8,8 +8,8 @@ #include #include -#include "utils.h" -#include "v4l2_videodevice.h" +#include "libcamera/internal/utils.h" +#include "libcamera/internal/v4l2_videodevice.h" #include "v4l2_videodevice_test.h" diff --git a/test/v4l2_videodevice/v4l2_m2mdevice.cpp b/test/v4l2_videodevice/v4l2_m2mdevice.cpp index d20e5dfc3..44a39d4d8 100644 --- a/test/v4l2_videodevice/v4l2_m2mdevice.cpp +++ b/test/v4l2_videodevice/v4l2_m2mdevice.cpp @@ -11,10 +11,10 @@ #include #include -#include "device_enumerator.h" -#include "media_device.h" -#include "thread.h" -#include "v4l2_videodevice.h" +#include "libcamera/internal/device_enumerator.h" +#include "libcamera/internal/media_device.h" +#include "libcamera/internal/thread.h" +#include "libcamera/internal/v4l2_videodevice.h" #include "test.h" diff --git a/test/v4l2_videodevice/v4l2_videodevice_test.cpp b/test/v4l2_videodevice/v4l2_videodevice_test.cpp index 93b9e72da..f23aaf8f5 100644 --- a/test/v4l2_videodevice/v4l2_videodevice_test.cpp +++ b/test/v4l2_videodevice/v4l2_videodevice_test.cpp @@ -9,10 +9,10 @@ #include -#include "v4l2_videodevice_test.h" +#include "libcamera/internal/device_enumerator.h" +#include "libcamera/internal/media_device.h" -#include "device_enumerator.h" -#include "media_device.h" +#include "v4l2_videodevice_test.h" using namespace std; using namespace libcamera; diff --git a/test/v4l2_videodevice/v4l2_videodevice_test.h b/test/v4l2_videodevice/v4l2_videodevice_test.h index 9acaceb84..21054561e 100644 --- a/test/v4l2_videodevice/v4l2_videodevice_test.h +++ b/test/v4l2_videodevice/v4l2_videodevice_test.h @@ -11,13 +11,13 @@ #include -#include "test.h" +#include "libcamera/internal/camera_sensor.h" +#include "libcamera/internal/device_enumerator.h" +#include "libcamera/internal/media_device.h" +#include "libcamera/internal/v4l2_subdevice.h" +#include "libcamera/internal/v4l2_videodevice.h" -#include "camera_sensor.h" -#include "device_enumerator.h" -#include "media_device.h" -#include "v4l2_subdevice.h" -#include "v4l2_videodevice.h" +#include "test.h" using namespace libcamera;