diff --git a/Documentation/guides/pipeline-handler.rst b/Documentation/guides/pipeline-handler.rst index 3047e006e..152776935 100644 --- a/Documentation/guides/pipeline-handler.rst +++ b/Documentation/guides/pipeline-handler.rst @@ -288,7 +288,8 @@ features: .. code-block:: cpp - #include "libcamera/internal/log.h" + #include + #include "libcamera/internal/pipeline_handler.h" Run the following commands: diff --git a/include/libcamera/bound_method.h b/include/libcamera/base/bound_method.h similarity index 97% rename from include/libcamera/bound_method.h rename to include/libcamera/base/bound_method.h index 4fc445ecd..282f9b58a 100644 --- a/include/libcamera/bound_method.h +++ b/include/libcamera/base/bound_method.h @@ -4,8 +4,8 @@ * * bound_method.h - Method bind and invocation */ -#ifndef __LIBCAMERA_BOUND_METHOD_H__ -#define __LIBCAMERA_BOUND_METHOD_H__ +#ifndef __LIBCAMERA_BASE_BOUND_METHOD_H__ +#define __LIBCAMERA_BASE_BOUND_METHOD_H__ #include #include @@ -236,4 +236,4 @@ private: } /* namespace libcamera */ -#endif /* __LIBCAMERA_BOUND_METHOD_H__ */ +#endif /* __LIBCAMERA_BASE_BOUND_METHOD_H__ */ diff --git a/include/libcamera/internal/event_dispatcher.h b/include/libcamera/base/event_dispatcher.h similarity index 79% rename from include/libcamera/internal/event_dispatcher.h rename to include/libcamera/base/event_dispatcher.h index e6a8ad65c..045df27ff 100644 --- a/include/libcamera/internal/event_dispatcher.h +++ b/include/libcamera/base/event_dispatcher.h @@ -4,8 +4,8 @@ * * event_dispatcher.h - Event dispatcher */ -#ifndef __LIBCAMERA_INTERNAL_EVENT_DISPATCHER_H__ -#define __LIBCAMERA_INTERNAL_EVENT_DISPATCHER_H__ +#ifndef __LIBCAMERA_BASE_EVENT_DISPATCHER_H__ +#define __LIBCAMERA_BASE_EVENT_DISPATCHER_H__ #include @@ -32,4 +32,4 @@ public: } /* namespace libcamera */ -#endif /* __LIBCAMERA_INTERNAL_EVENT_DISPATCHER_H__ */ +#endif /* __LIBCAMERA_BASE_EVENT_DISPATCHER_H__ */ diff --git a/include/libcamera/internal/event_dispatcher_poll.h b/include/libcamera/base/event_dispatcher_poll.h similarity index 82% rename from include/libcamera/internal/event_dispatcher_poll.h rename to include/libcamera/base/event_dispatcher_poll.h index 33de051de..ae2a3f04e 100644 --- a/include/libcamera/internal/event_dispatcher_poll.h +++ b/include/libcamera/base/event_dispatcher_poll.h @@ -4,14 +4,14 @@ * * event_dispatcher_poll.h - Poll-based event dispatcher */ -#ifndef __LIBCAMERA_INTERNAL_EVENT_DISPATCHER_POLL_H__ -#define __LIBCAMERA_INTERNAL_EVENT_DISPATCHER_POLL_H__ +#ifndef __LIBCAMERA_BASE_EVENT_DISPATCHER_POLL_H__ +#define __LIBCAMERA_BASE_EVENT_DISPATCHER_POLL_H__ #include #include #include -#include "libcamera/internal/event_dispatcher.h" +#include struct pollfd; @@ -55,4 +55,4 @@ private: } /* namespace libcamera */ -#endif /* __LIBCAMERA_INTERNAL_EVENT_DISPATCHER_POLL_H__ */ +#endif /* __LIBCAMERA_BASE_EVENT_DISPATCHER_POLL_H__ */ diff --git a/include/libcamera/internal/log.h b/include/libcamera/base/log.h similarity index 96% rename from include/libcamera/internal/log.h rename to include/libcamera/base/log.h index 82e55a623..b93c947ae 100644 --- a/include/libcamera/internal/log.h +++ b/include/libcamera/base/log.h @@ -4,8 +4,8 @@ * * log.h - Logging infrastructure */ -#ifndef __LIBCAMERA_INTERNAL_LOG_H__ -#define __LIBCAMERA_INTERNAL_LOG_H__ +#ifndef __LIBCAMERA_BASE_LOG_H__ +#define __LIBCAMERA_BASE_LOG_H__ #include #include @@ -127,4 +127,4 @@ LogMessage _log(const LogCategory *category, LogSeverity severity, } /* namespace libcamera */ -#endif /* __LIBCAMERA_INTERNAL_LOG_H__ */ +#endif /* __LIBCAMERA_BASE_LOG_H__ */ diff --git a/include/libcamera/base/meson.build b/include/libcamera/base/meson.build index 2db756c50..7a858dcb6 100644 --- a/include/libcamera/base/meson.build +++ b/include/libcamera/base/meson.build @@ -3,7 +3,17 @@ libcamera_base_include_dir = libcamera_include_dir / 'base' libcamera_base_headers = files([ + 'bound_method.h', 'class.h', + 'event_dispatcher.h', + 'event_dispatcher_poll.h', + 'log.h', + 'message.h', + 'object.h', + 'semaphore.h', + 'signal.h', + 'thread.h', + 'timer.h', 'utils.h', ]) diff --git a/include/libcamera/internal/message.h b/include/libcamera/base/message.h similarity index 87% rename from include/libcamera/internal/message.h rename to include/libcamera/base/message.h index f1b133bfb..5d2a9f04f 100644 --- a/include/libcamera/internal/message.h +++ b/include/libcamera/base/message.h @@ -4,12 +4,12 @@ * * message.h - Message queue support */ -#ifndef __LIBCAMERA_INTERNAL_MESSAGE_H__ -#define __LIBCAMERA_INTERNAL_MESSAGE_H__ +#ifndef __LIBCAMERA_BASE_MESSAGE_H__ +#define __LIBCAMERA_BASE_MESSAGE_H__ #include -#include +#include namespace libcamera { @@ -68,4 +68,4 @@ private: } /* namespace libcamera */ -#endif /* __LIBCAMERA_INTERNAL_MESSAGE_H__ */ +#endif /* __LIBCAMERA_BASE_MESSAGE_H__ */ diff --git a/include/libcamera/object.h b/include/libcamera/base/object.h similarity index 89% rename from include/libcamera/object.h rename to include/libcamera/base/object.h index a1882f05f..5c385ab4b 100644 --- a/include/libcamera/object.h +++ b/include/libcamera/base/object.h @@ -4,14 +4,14 @@ * * object.h - Base object */ -#ifndef __LIBCAMERA_OBJECT_H__ -#define __LIBCAMERA_OBJECT_H__ +#ifndef __LIBCAMERA_BASE_OBJECT_H__ +#define __LIBCAMERA_BASE_OBJECT_H__ #include #include #include -#include +#include namespace libcamera { @@ -68,4 +68,4 @@ private: } /* namespace libcamera */ -#endif /* __LIBCAMERA_OBJECT_H__ */ +#endif /* __LIBCAMERA_BASE_OBJECT_H__ */ diff --git a/include/libcamera/internal/semaphore.h b/include/libcamera/base/semaphore.h similarity index 74% rename from include/libcamera/internal/semaphore.h rename to include/libcamera/base/semaphore.h index 9dc65d299..c8e62e3ee 100644 --- a/include/libcamera/internal/semaphore.h +++ b/include/libcamera/base/semaphore.h @@ -4,12 +4,12 @@ * * semaphore.h - General-purpose counting semaphore */ -#ifndef __LIBCAMERA_INTERNAL_SEMAPHORE_H__ -#define __LIBCAMERA_INTERNAL_SEMAPHORE_H__ +#ifndef __LIBCAMERA_BASE_SEMAPHORE_H__ +#define __LIBCAMERA_BASE_SEMAPHORE_H__ #include -#include "libcamera/internal/thread.h" +#include namespace libcamera { @@ -31,4 +31,4 @@ private: } /* namespace libcamera */ -#endif /* __LIBCAMERA_INTERNAL_SEMAPHORE_H__ */ +#endif /* __LIBCAMERA_BASE_SEMAPHORE_H__ */ diff --git a/include/libcamera/signal.h b/include/libcamera/base/signal.h similarity index 93% rename from include/libcamera/signal.h rename to include/libcamera/base/signal.h index 3233529a1..c2521769a 100644 --- a/include/libcamera/signal.h +++ b/include/libcamera/base/signal.h @@ -4,16 +4,16 @@ * * signal.h - Signal & slot implementation */ -#ifndef __LIBCAMERA_SIGNAL_H__ -#define __LIBCAMERA_SIGNAL_H__ +#ifndef __LIBCAMERA_BASE_SIGNAL_H__ +#define __LIBCAMERA_BASE_SIGNAL_H__ #include #include #include #include -#include -#include +#include +#include namespace libcamera { @@ -129,4 +129,4 @@ public: } /* namespace libcamera */ -#endif /* __LIBCAMERA_SIGNAL_H__ */ +#endif /* __LIBCAMERA_BASE_SIGNAL_H__ */ diff --git a/include/libcamera/internal/thread.h b/include/libcamera/base/thread.h similarity index 86% rename from include/libcamera/internal/thread.h rename to include/libcamera/base/thread.h index 9662e28bb..2ed18d49c 100644 --- a/include/libcamera/internal/thread.h +++ b/include/libcamera/base/thread.h @@ -4,20 +4,18 @@ * * thread.h - Thread support */ -#ifndef __LIBCAMERA_INTERNAL_THREAD_H__ -#define __LIBCAMERA_INTERNAL_THREAD_H__ +#ifndef __LIBCAMERA_BASE_THREAD_H__ +#define __LIBCAMERA_BASE_THREAD_H__ #include #include #include #include -#include - +#include +#include #include -#include "libcamera/internal/message.h" - namespace libcamera { class EventDispatcher; @@ -75,4 +73,4 @@ private: } /* namespace libcamera */ -#endif /* __LIBCAMERA_INTERNAL_THREAD_H__ */ +#endif /* __LIBCAMERA_BASE_THREAD_H__ */ diff --git a/include/libcamera/internal/timer.h b/include/libcamera/base/timer.h similarity index 81% rename from include/libcamera/internal/timer.h rename to include/libcamera/base/timer.h index 013e93c0b..e79e85f1e 100644 --- a/include/libcamera/internal/timer.h +++ b/include/libcamera/base/timer.h @@ -4,14 +4,14 @@ * * timer.h - Generic timer */ -#ifndef __LIBCAMERA_INTERNAL_TIMER_H__ -#define __LIBCAMERA_INTERNAL_TIMER_H__ +#ifndef __LIBCAMERA_BASE_TIMER_H__ +#define __LIBCAMERA_BASE_TIMER_H__ #include #include -#include -#include +#include +#include namespace libcamera { @@ -46,4 +46,4 @@ private: } /* namespace libcamera */ -#endif /* __LIBCAMERA_INTERNAL_TIMER_H__ */ +#endif /* __LIBCAMERA_BASE_TIMER_H__ */ diff --git a/include/libcamera/camera.h b/include/libcamera/camera.h index ea0914009..b081907e0 100644 --- a/include/libcamera/camera.h +++ b/include/libcamera/camera.h @@ -13,11 +13,11 @@ #include #include +#include +#include #include -#include #include -#include #include #include diff --git a/include/libcamera/camera_manager.h b/include/libcamera/camera_manager.h index 5deede035..744e5a06c 100644 --- a/include/libcamera/camera_manager.h +++ b/include/libcamera/camera_manager.h @@ -13,9 +13,8 @@ #include #include - -#include -#include +#include +#include namespace libcamera { diff --git a/include/libcamera/internal/camera_sensor.h b/include/libcamera/internal/camera_sensor.h index 7bc540619..db12b07ee 100644 --- a/include/libcamera/internal/camera_sensor.h +++ b/include/libcamera/internal/camera_sensor.h @@ -12,13 +12,13 @@ #include #include +#include #include #include #include #include "libcamera/internal/formats.h" -#include "libcamera/internal/log.h" #include "libcamera/internal/v4l2_subdevice.h" namespace libcamera { diff --git a/include/libcamera/internal/device_enumerator.h b/include/libcamera/internal/device_enumerator.h index 707cfe8f3..222caf75a 100644 --- a/include/libcamera/internal/device_enumerator.h +++ b/include/libcamera/internal/device_enumerator.h @@ -13,7 +13,7 @@ #include -#include +#include namespace libcamera { diff --git a/include/libcamera/internal/event_notifier.h b/include/libcamera/internal/event_notifier.h index cc3495c02..8a6419f23 100644 --- a/include/libcamera/internal/event_notifier.h +++ b/include/libcamera/internal/event_notifier.h @@ -7,8 +7,8 @@ #ifndef __LIBCAMERA_INTERNAL_EVENT_NOTIFIER_H__ #define __LIBCAMERA_INTERNAL_EVENT_NOTIFIER_H__ -#include -#include +#include +#include namespace libcamera { diff --git a/include/libcamera/internal/ipa_data_serializer.h b/include/libcamera/internal/ipa_data_serializer.h index 70168acc2..76325b1d1 100644 --- a/include/libcamera/internal/ipa_data_serializer.h +++ b/include/libcamera/internal/ipa_data_serializer.h @@ -14,6 +14,8 @@ #include #include +#include + #include #include #include @@ -22,7 +24,6 @@ #include "libcamera/internal/byte_stream_buffer.h" #include "libcamera/internal/camera_sensor.h" #include "libcamera/internal/control_serializer.h" -#include "libcamera/internal/log.h" namespace libcamera { diff --git a/include/libcamera/internal/ipa_manager.h b/include/libcamera/internal/ipa_manager.h index e904a2be7..34224e330 100644 --- a/include/libcamera/internal/ipa_manager.h +++ b/include/libcamera/internal/ipa_manager.h @@ -10,11 +10,12 @@ #include #include +#include + #include #include #include "libcamera/internal/ipa_module.h" -#include "libcamera/internal/log.h" #include "libcamera/internal/pipeline_handler.h" #include "libcamera/internal/pub_key.h" diff --git a/include/libcamera/internal/ipa_module.h b/include/libcamera/internal/ipa_module.h index 19fc58272..a87f56502 100644 --- a/include/libcamera/internal/ipa_module.h +++ b/include/libcamera/internal/ipa_module.h @@ -11,10 +11,11 @@ #include #include +#include + #include #include -#include "libcamera/internal/log.h" #include "libcamera/internal/pipeline_handler.h" namespace libcamera { diff --git a/include/libcamera/internal/ipc_pipe.h b/include/libcamera/internal/ipc_pipe.h index c9a84b78c..e58de3402 100644 --- a/include/libcamera/internal/ipc_pipe.h +++ b/include/libcamera/internal/ipc_pipe.h @@ -9,9 +9,9 @@ #include -#include "libcamera/internal/ipc_unixsocket.h" +#include -#include +#include "libcamera/internal/ipc_unixsocket.h" namespace libcamera { diff --git a/include/libcamera/internal/ipc_unixsocket.h b/include/libcamera/internal/ipc_unixsocket.h index e871b6503..9f5b06773 100644 --- a/include/libcamera/internal/ipc_unixsocket.h +++ b/include/libcamera/internal/ipc_unixsocket.h @@ -12,7 +12,7 @@ #include #include -#include +#include namespace libcamera { diff --git a/include/libcamera/internal/media_device.h b/include/libcamera/internal/media_device.h index c3292508c..8424611d7 100644 --- a/include/libcamera/internal/media_device.h +++ b/include/libcamera/internal/media_device.h @@ -14,9 +14,9 @@ #include -#include +#include +#include -#include "libcamera/internal/log.h" #include "libcamera/internal/media_object.h" namespace libcamera { diff --git a/include/libcamera/internal/meson.build b/include/libcamera/internal/meson.build index 1348e9266..cf664fc9c 100644 --- a/include/libcamera/internal/meson.build +++ b/include/libcamera/internal/meson.build @@ -22,8 +22,6 @@ libcamera_internal_headers = files([ 'device_enumerator.h', 'device_enumerator_sysfs.h', 'device_enumerator_udev.h', - 'event_dispatcher.h', - 'event_dispatcher_poll.h', 'event_notifier.h', 'file.h', 'formats.h', @@ -31,18 +29,13 @@ libcamera_internal_headers = files([ 'ipa_module.h', 'ipa_proxy.h', 'ipc_unixsocket.h', - 'log.h', 'media_device.h', 'media_object.h', - 'message.h', 'pipeline_handler.h', 'process.h', 'pub_key.h', - 'semaphore.h', 'source_paths.h', 'sysfs.h', - 'thread.h', - 'timer.h', 'v4l2_device.h', 'v4l2_pixelformat.h', 'v4l2_subdevice.h', diff --git a/include/libcamera/internal/pipeline_handler.h b/include/libcamera/internal/pipeline_handler.h index 8beb6b76d..9e2d65d6f 100644 --- a/include/libcamera/internal/pipeline_handler.h +++ b/include/libcamera/internal/pipeline_handler.h @@ -16,9 +16,9 @@ #include #include +#include #include -#include #include #include "libcamera/internal/ipa_proxy.h" diff --git a/include/libcamera/internal/process.h b/include/libcamera/internal/process.h index 254cda853..c4d5d9c1c 100644 --- a/include/libcamera/internal/process.h +++ b/include/libcamera/internal/process.h @@ -11,7 +11,7 @@ #include #include -#include +#include namespace libcamera { diff --git a/include/libcamera/internal/v4l2_device.h b/include/libcamera/internal/v4l2_device.h index c318e976a..1edd664a9 100644 --- a/include/libcamera/internal/v4l2_device.h +++ b/include/libcamera/internal/v4l2_device.h @@ -13,11 +13,11 @@ #include -#include -#include -#include +#include +#include -#include "libcamera/internal/log.h" +#include +#include namespace libcamera { diff --git a/include/libcamera/internal/v4l2_subdevice.h b/include/libcamera/internal/v4l2_subdevice.h index d07dd6b44..97b89fb95 100644 --- a/include/libcamera/internal/v4l2_subdevice.h +++ b/include/libcamera/internal/v4l2_subdevice.h @@ -12,11 +12,11 @@ #include #include +#include #include #include "libcamera/internal/formats.h" -#include "libcamera/internal/log.h" #include "libcamera/internal/media_object.h" #include "libcamera/internal/v4l2_device.h" diff --git a/include/libcamera/internal/v4l2_videodevice.h b/include/libcamera/internal/v4l2_videodevice.h index 227d015e8..a7c3d5290 100644 --- a/include/libcamera/internal/v4l2_videodevice.h +++ b/include/libcamera/internal/v4l2_videodevice.h @@ -17,14 +17,14 @@ #include #include +#include +#include #include #include #include -#include #include "libcamera/internal/formats.h" -#include "libcamera/internal/log.h" #include "libcamera/internal/v4l2_device.h" #include "libcamera/internal/v4l2_pixelformat.h" diff --git a/include/libcamera/ipa/ipa_interface.h b/include/libcamera/ipa/ipa_interface.h index 4aefaa715..9a15c86b1 100644 --- a/include/libcamera/ipa/ipa_interface.h +++ b/include/libcamera/ipa/ipa_interface.h @@ -13,10 +13,11 @@ #include #include +#include + #include #include #include -#include namespace libcamera { diff --git a/include/libcamera/meson.build b/include/libcamera/meson.build index 21a433889..c69d63d29 100644 --- a/include/libcamera/meson.build +++ b/include/libcamera/meson.build @@ -1,7 +1,6 @@ # SPDX-License-Identifier: CC0-1.0 libcamera_public_headers = files([ - 'bound_method.h', 'buffer.h', 'camera.h', 'camera_manager.h', @@ -11,10 +10,8 @@ libcamera_public_headers = files([ 'framebuffer_allocator.h', 'geometry.h', 'logging.h', - 'object.h', 'pixel_format.h', 'request.h', - 'signal.h', 'span.h', 'stream.h', 'transform.h', diff --git a/include/libcamera/request.h b/include/libcamera/request.h index 00c646fea..2d361c9d9 100644 --- a/include/libcamera/request.h +++ b/include/libcamera/request.h @@ -14,9 +14,9 @@ #include #include +#include #include -#include namespace libcamera { diff --git a/src/android/camera3_hal.cpp b/src/android/camera3_hal.cpp index e6d435e05..da836baec 100644 --- a/src/android/camera3_hal.cpp +++ b/src/android/camera3_hal.cpp @@ -7,7 +7,7 @@ #include -#include "libcamera/internal/log.h" +#include #include "camera_device.h" #include "camera_hal_manager.h" diff --git a/src/android/camera_capabilities.cpp b/src/android/camera_capabilities.cpp index 00224a6d6..6b5edb66f 100644 --- a/src/android/camera_capabilities.cpp +++ b/src/android/camera_capabilities.cpp @@ -12,12 +12,13 @@ #include +#include + #include #include #include #include "libcamera/internal/formats.h" -#include "libcamera/internal/log.h" using namespace libcamera; diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp index 6243c07e2..86ea22b61 100644 --- a/src/android/camera_device.cpp +++ b/src/android/camera_device.cpp @@ -15,16 +15,15 @@ #include #include +#include +#include +#include + #include #include #include #include -#include - -#include "libcamera/internal/log.h" -#include "libcamera/internal/thread.h" - #include "system/graphics.h" using namespace libcamera; diff --git a/src/android/camera_device.h b/src/android/camera_device.h index 090fe28a5..4747f577a 100644 --- a/src/android/camera_device.h +++ b/src/android/camera_device.h @@ -14,15 +14,16 @@ #include +#include +#include +#include + #include #include #include #include #include "libcamera/internal/buffer.h" -#include "libcamera/internal/log.h" -#include "libcamera/internal/message.h" -#include "libcamera/internal/thread.h" #include "camera_capabilities.h" #include "camera_metadata.h" diff --git a/src/android/camera_hal_config.cpp b/src/android/camera_hal_config.cpp index f33ba2693..d84de4fd6 100644 --- a/src/android/camera_hal_config.cpp +++ b/src/android/camera_hal_config.cpp @@ -21,7 +21,7 @@ namespace filesystem = std::experimental::filesystem; #include -#include "libcamera/internal/log.h" +#include using namespace libcamera; diff --git a/src/android/camera_hal_manager.cpp b/src/android/camera_hal_manager.cpp index 54087d3a2..4cd67544f 100644 --- a/src/android/camera_hal_manager.cpp +++ b/src/android/camera_hal_manager.cpp @@ -7,11 +7,11 @@ #include "camera_hal_manager.h" +#include + #include #include -#include "libcamera/internal/log.h" - #include "camera_device.h" using namespace libcamera; diff --git a/src/android/camera_metadata.cpp b/src/android/camera_metadata.cpp index c7298d620..3fc7cf273 100644 --- a/src/android/camera_metadata.cpp +++ b/src/android/camera_metadata.cpp @@ -7,7 +7,7 @@ #include "camera_metadata.h" -#include "libcamera/internal/log.h" +#include using namespace libcamera; diff --git a/src/android/camera_worker.h b/src/android/camera_worker.h index e289ef9b8..6e1aee4a3 100644 --- a/src/android/camera_worker.h +++ b/src/android/camera_worker.h @@ -9,14 +9,14 @@ #include +#include +#include + #include #include -#include #include #include -#include "libcamera/internal/thread.h" - class CameraDevice; class CaptureRequest diff --git a/src/android/jpeg/encoder_libjpeg.cpp b/src/android/jpeg/encoder_libjpeg.cpp index f006e1d19..e6358ca94 100644 --- a/src/android/jpeg/encoder_libjpeg.cpp +++ b/src/android/jpeg/encoder_libjpeg.cpp @@ -16,12 +16,13 @@ #include #include +#include + #include #include #include #include "libcamera/internal/formats.h" -#include "libcamera/internal/log.h" using namespace libcamera; diff --git a/src/android/jpeg/exif.cpp b/src/android/jpeg/exif.cpp index 747f1cfaa..0ba4cb85f 100644 --- a/src/android/jpeg/exif.cpp +++ b/src/android/jpeg/exif.cpp @@ -14,10 +14,9 @@ #include #include +#include #include -#include "libcamera/internal/log.h" - using namespace libcamera; LOG_DEFINE_CATEGORY(EXIF) diff --git a/src/android/jpeg/post_processor_jpeg.cpp b/src/android/jpeg/post_processor_jpeg.cpp index 058ccc998..0e93f365d 100644 --- a/src/android/jpeg/post_processor_jpeg.cpp +++ b/src/android/jpeg/post_processor_jpeg.cpp @@ -14,9 +14,9 @@ #include "encoder_libjpeg.h" #include "exif.h" -#include +#include -#include "libcamera/internal/log.h" +#include using namespace libcamera; using namespace std::chrono_literals; diff --git a/src/android/jpeg/thumbnailer.cpp b/src/android/jpeg/thumbnailer.cpp index f709d3435..5cb00744a 100644 --- a/src/android/jpeg/thumbnailer.cpp +++ b/src/android/jpeg/thumbnailer.cpp @@ -7,9 +7,9 @@ #include "thumbnailer.h" -#include +#include -#include "libcamera/internal/log.h" +#include using namespace libcamera; diff --git a/src/android/mm/cros_camera_buffer.cpp b/src/android/mm/cros_camera_buffer.cpp index c4157606d..0008d261a 100644 --- a/src/android/mm/cros_camera_buffer.cpp +++ b/src/android/mm/cros_camera_buffer.cpp @@ -7,7 +7,7 @@ #include "../camera_buffer.h" -#include "libcamera/internal/log.h" +#include #include "cros-camera/camera_buffer_manager.h" diff --git a/src/android/mm/generic_camera_buffer.cpp b/src/android/mm/generic_camera_buffer.cpp index cca88cf36..326fdc066 100644 --- a/src/android/mm/generic_camera_buffer.cpp +++ b/src/android/mm/generic_camera_buffer.cpp @@ -9,8 +9,9 @@ #include +#include + #include "libcamera/internal/buffer.h" -#include "libcamera/internal/log.h" using namespace libcamera; diff --git a/src/android/yuv/post_processor_yuv.cpp b/src/android/yuv/post_processor_yuv.cpp index b67364c8f..772e805b3 100644 --- a/src/android/yuv/post_processor_yuv.cpp +++ b/src/android/yuv/post_processor_yuv.cpp @@ -9,12 +9,13 @@ #include +#include + #include #include #include #include "libcamera/internal/formats.h" -#include "libcamera/internal/log.h" using namespace libcamera; diff --git a/src/ipa/ipu3/ipu3.cpp b/src/ipa/ipu3/ipu3.cpp index 8b4c7351e..31a3c006a 100644 --- a/src/ipa/ipu3/ipu3.cpp +++ b/src/ipa/ipu3/ipu3.cpp @@ -11,6 +11,8 @@ #include #include +#include + #include #include #include @@ -19,7 +21,6 @@ #include #include "libcamera/internal/buffer.h" -#include "libcamera/internal/log.h" #include "ipu3_agc.h" #include "ipu3_awb.h" diff --git a/src/ipa/ipu3/ipu3_agc.cpp b/src/ipa/ipu3/ipu3_agc.cpp index c476a60d4..fd0b70f02 100644 --- a/src/ipa/ipu3/ipu3_agc.cpp +++ b/src/ipa/ipu3/ipu3_agc.cpp @@ -11,9 +11,9 @@ #include #include -#include +#include -#include "libcamera/internal/log.h" +#include #include "libipa/histogram.h" diff --git a/src/ipa/ipu3/ipu3_awb.cpp b/src/ipa/ipu3/ipu3_awb.cpp index 54ce8e671..9b409c8ff 100644 --- a/src/ipa/ipu3/ipu3_awb.cpp +++ b/src/ipa/ipu3/ipu3_awb.cpp @@ -10,7 +10,7 @@ #include #include -#include "libcamera/internal/log.h" +#include namespace libcamera { diff --git a/src/ipa/libipa/histogram.cpp b/src/ipa/libipa/histogram.cpp index d4d7cfdff..fb1eb2a2f 100644 --- a/src/ipa/libipa/histogram.cpp +++ b/src/ipa/libipa/histogram.cpp @@ -8,7 +8,7 @@ #include -#include "libcamera/internal/log.h" +#include /** * \file histogram.h diff --git a/src/ipa/raspberrypi/cam_helper.hpp b/src/ipa/raspberrypi/cam_helper.hpp index 221898ceb..a66648197 100644 --- a/src/ipa/raspberrypi/cam_helper.hpp +++ b/src/ipa/raspberrypi/cam_helper.hpp @@ -10,13 +10,13 @@ #include +#include + #include "camera_mode.h" #include "controller/controller.hpp" #include "controller/metadata.hpp" #include "md_parser.hpp" -#include - #include "libcamera/internal/v4l2_videodevice.h" namespace RPiController { diff --git a/src/ipa/raspberrypi/controller/controller.cpp b/src/ipa/raspberrypi/controller/controller.cpp index 96b58359a..d3433ad2e 100644 --- a/src/ipa/raspberrypi/controller/controller.cpp +++ b/src/ipa/raspberrypi/controller/controller.cpp @@ -5,7 +5,7 @@ * controller.cpp - ISP controller */ -#include "libcamera/internal/log.h" +#include #include "algorithm.hpp" #include "controller.hpp" diff --git a/src/ipa/raspberrypi/controller/rpi/agc.cpp b/src/ipa/raspberrypi/controller/rpi/agc.cpp index 55e80ac74..1ed578cfd 100644 --- a/src/ipa/raspberrypi/controller/rpi/agc.cpp +++ b/src/ipa/raspberrypi/controller/rpi/agc.cpp @@ -9,7 +9,7 @@ #include "linux/bcm2835-isp.h" -#include "libcamera/internal/log.h" +#include #include "../awb_status.h" #include "../device_status.h" diff --git a/src/ipa/raspberrypi/controller/rpi/alsc.cpp b/src/ipa/raspberrypi/controller/rpi/alsc.cpp index b0d24aa2e..3cdc95a99 100644 --- a/src/ipa/raspberrypi/controller/rpi/alsc.cpp +++ b/src/ipa/raspberrypi/controller/rpi/alsc.cpp @@ -6,7 +6,7 @@ */ #include -#include "libcamera/internal/log.h" +#include #include "../awb_status.h" #include "alsc.hpp" diff --git a/src/ipa/raspberrypi/controller/rpi/awb.cpp b/src/ipa/raspberrypi/controller/rpi/awb.cpp index 1c917e4f3..5cfd33a38 100644 --- a/src/ipa/raspberrypi/controller/rpi/awb.cpp +++ b/src/ipa/raspberrypi/controller/rpi/awb.cpp @@ -5,7 +5,7 @@ * awb.cpp - AWB control algorithm */ -#include "libcamera/internal/log.h" +#include #include "../lux_status.h" diff --git a/src/ipa/raspberrypi/controller/rpi/black_level.cpp b/src/ipa/raspberrypi/controller/rpi/black_level.cpp index 9ac855f50..6b3497f13 100644 --- a/src/ipa/raspberrypi/controller/rpi/black_level.cpp +++ b/src/ipa/raspberrypi/controller/rpi/black_level.cpp @@ -8,7 +8,7 @@ #include #include -#include "libcamera/internal/log.h" +#include #include "../black_level_status.h" diff --git a/src/ipa/raspberrypi/controller/rpi/ccm.cpp b/src/ipa/raspberrypi/controller/rpi/ccm.cpp index dbdcbb39d..821a4c7c9 100644 --- a/src/ipa/raspberrypi/controller/rpi/ccm.cpp +++ b/src/ipa/raspberrypi/controller/rpi/ccm.cpp @@ -5,7 +5,7 @@ * ccm.cpp - CCM (colour correction matrix) control algorithm */ -#include "libcamera/internal/log.h" +#include #include "../awb_status.h" #include "../ccm_status.h" diff --git a/src/ipa/raspberrypi/controller/rpi/contrast.cpp b/src/ipa/raspberrypi/controller/rpi/contrast.cpp index 2bc43027a..ae55aad56 100644 --- a/src/ipa/raspberrypi/controller/rpi/contrast.cpp +++ b/src/ipa/raspberrypi/controller/rpi/contrast.cpp @@ -6,7 +6,7 @@ */ #include -#include "libcamera/internal/log.h" +#include #include "../contrast_status.h" #include "../histogram.hpp" diff --git a/src/ipa/raspberrypi/controller/rpi/dpc.cpp b/src/ipa/raspberrypi/controller/rpi/dpc.cpp index e533cd53e..110f50560 100644 --- a/src/ipa/raspberrypi/controller/rpi/dpc.cpp +++ b/src/ipa/raspberrypi/controller/rpi/dpc.cpp @@ -5,7 +5,7 @@ * dpc.cpp - DPC (defective pixel correction) control algorithm */ -#include "libcamera/internal/log.h" +#include #include "dpc.hpp" diff --git a/src/ipa/raspberrypi/controller/rpi/focus.cpp b/src/ipa/raspberrypi/controller/rpi/focus.cpp index bab4406fe..a87ec802b 100644 --- a/src/ipa/raspberrypi/controller/rpi/focus.cpp +++ b/src/ipa/raspberrypi/controller/rpi/focus.cpp @@ -6,7 +6,7 @@ */ #include -#include "libcamera/internal/log.h" +#include #include "../focus_status.h" #include "focus.hpp" diff --git a/src/ipa/raspberrypi/controller/rpi/geq.cpp b/src/ipa/raspberrypi/controller/rpi/geq.cpp index 5eff116cd..bdceb1f3d 100644 --- a/src/ipa/raspberrypi/controller/rpi/geq.cpp +++ b/src/ipa/raspberrypi/controller/rpi/geq.cpp @@ -5,7 +5,7 @@ * geq.cpp - GEQ (green equalisation) control algorithm */ -#include "libcamera/internal/log.h" +#include #include "../device_status.h" #include "../lux_status.h" diff --git a/src/ipa/raspberrypi/controller/rpi/lux.cpp b/src/ipa/raspberrypi/controller/rpi/lux.cpp index 258e44f4d..f58d69397 100644 --- a/src/ipa/raspberrypi/controller/rpi/lux.cpp +++ b/src/ipa/raspberrypi/controller/rpi/lux.cpp @@ -8,7 +8,7 @@ #include "linux/bcm2835-isp.h" -#include "libcamera/internal/log.h" +#include #include "../device_status.h" diff --git a/src/ipa/raspberrypi/controller/rpi/noise.cpp b/src/ipa/raspberrypi/controller/rpi/noise.cpp index 156f75019..63cad639f 100644 --- a/src/ipa/raspberrypi/controller/rpi/noise.cpp +++ b/src/ipa/raspberrypi/controller/rpi/noise.cpp @@ -7,7 +7,7 @@ #include -#include "libcamera/internal/log.h" +#include #include "../device_status.h" #include "../noise_status.h" diff --git a/src/ipa/raspberrypi/controller/rpi/sdn.cpp b/src/ipa/raspberrypi/controller/rpi/sdn.cpp index 959bc7406..938455098 100644 --- a/src/ipa/raspberrypi/controller/rpi/sdn.cpp +++ b/src/ipa/raspberrypi/controller/rpi/sdn.cpp @@ -5,7 +5,7 @@ * sdn.cpp - SDN (spatial denoise) control algorithm */ -#include "libcamera/internal/log.h" +#include #include "../denoise_status.h" #include "../noise_status.h" diff --git a/src/ipa/raspberrypi/controller/rpi/sharpen.cpp b/src/ipa/raspberrypi/controller/rpi/sharpen.cpp index 2cd861ca6..b0c2e00a8 100644 --- a/src/ipa/raspberrypi/controller/rpi/sharpen.cpp +++ b/src/ipa/raspberrypi/controller/rpi/sharpen.cpp @@ -7,7 +7,7 @@ #include -#include "libcamera/internal/log.h" +#include #include "../sharpen_status.h" diff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp index 1c1e802a2..a3f014495 100644 --- a/src/ipa/raspberrypi/raspberrypi.cpp +++ b/src/ipa/raspberrypi/raspberrypi.cpp @@ -13,6 +13,10 @@ #include #include +#include + +#include + #include #include #include @@ -25,9 +29,6 @@ #include #include "libcamera/internal/buffer.h" -#include "libcamera/internal/log.h" - -#include #include "agc_algorithm.hpp" #include "agc_status.h" diff --git a/src/ipa/rkisp1/rkisp1.cpp b/src/ipa/rkisp1/rkisp1.cpp index b47ea3240..cdfb4d139 100644 --- a/src/ipa/rkisp1/rkisp1.cpp +++ b/src/ipa/rkisp1/rkisp1.cpp @@ -15,6 +15,8 @@ #include #include +#include + #include #include #include @@ -22,8 +24,6 @@ #include #include -#include "libcamera/internal/log.h" - namespace libcamera { LOG_DEFINE_CATEGORY(IPARkISP1) diff --git a/src/ipa/vimc/vimc.cpp b/src/ipa/vimc/vimc.cpp index 13681d883..e44765af7 100644 --- a/src/ipa/vimc/vimc.cpp +++ b/src/ipa/vimc/vimc.cpp @@ -14,11 +14,12 @@ #include +#include + #include #include #include "libcamera/internal/file.h" -#include "libcamera/internal/log.h" namespace libcamera { diff --git a/src/libcamera/bound_method.cpp b/src/libcamera/base/bound_method.cpp similarity index 94% rename from src/libcamera/bound_method.cpp rename to src/libcamera/base/bound_method.cpp index 4965bb5e1..3ecec51c4 100644 --- a/src/libcamera/bound_method.cpp +++ b/src/libcamera/base/bound_method.cpp @@ -5,14 +5,13 @@ * bound_method.cpp - Method bind and invocation */ -#include - -#include "libcamera/internal/message.h" -#include "libcamera/internal/semaphore.h" -#include "libcamera/internal/thread.h" +#include +#include +#include +#include /** - * \file bound_method.h + * \file base/bound_method.h * \brief Method bind and invocation */ diff --git a/src/libcamera/event_dispatcher.cpp b/src/libcamera/base/event_dispatcher.cpp similarity index 97% rename from src/libcamera/event_dispatcher.cpp rename to src/libcamera/base/event_dispatcher.cpp index e0ce1eb3c..4be89e819 100644 --- a/src/libcamera/event_dispatcher.cpp +++ b/src/libcamera/base/event_dispatcher.cpp @@ -5,12 +5,11 @@ * event_dispatcher.cpp - Event dispatcher */ -#include "libcamera/internal/event_dispatcher.h" - -#include "libcamera/internal/log.h" +#include +#include /** - * \file event_dispatcher.h + * \file base/event_dispatcher.h */ namespace libcamera { diff --git a/src/libcamera/event_dispatcher_poll.cpp b/src/libcamera/base/event_dispatcher_poll.cpp similarity index 97% rename from src/libcamera/event_dispatcher_poll.cpp rename to src/libcamera/base/event_dispatcher_poll.cpp index 0b6aee187..d76ca7fc2 100644 --- a/src/libcamera/event_dispatcher_poll.cpp +++ b/src/libcamera/base/event_dispatcher_poll.cpp @@ -5,7 +5,7 @@ * event_dispatcher_poll.cpp - Poll-based event dispatcher */ -#include "libcamera/internal/event_dispatcher_poll.h" +#include #include #include @@ -16,15 +16,15 @@ #include #include +#include +#include +#include #include #include "libcamera/internal/event_notifier.h" -#include "libcamera/internal/log.h" -#include "libcamera/internal/thread.h" -#include "libcamera/internal/timer.h" /** - * \file event_dispatcher_poll.h + * \file base/event_dispatcher_poll.h */ namespace libcamera { diff --git a/src/libcamera/log.cpp b/src/libcamera/base/log.cpp similarity index 99% rename from src/libcamera/log.cpp rename to src/libcamera/base/log.cpp index 5ff0e9017..1801ae26a 100644 --- a/src/libcamera/log.cpp +++ b/src/libcamera/base/log.cpp @@ -5,7 +5,7 @@ * log.cpp - Logging infrastructure */ -#include "libcamera/internal/log.h" +#include #include #if HAVE_BACKTRACE @@ -23,12 +23,11 @@ #include +#include #include -#include "libcamera/internal/thread.h" - /** - * \file log.h + * \file base/log.h * \brief Logging infrastructure * * libcamera includes a logging infrastructure used through the library that diff --git a/src/libcamera/base/meson.build b/src/libcamera/base/meson.build index 302a28868..7a19c67c5 100644 --- a/src/libcamera/base/meson.build +++ b/src/libcamera/base/meson.build @@ -2,10 +2,21 @@ libcamera_base_sources = files([ 'class.cpp', + 'bound_method.cpp', + 'event_dispatcher.cpp', + 'event_dispatcher_poll.cpp', + 'log.cpp', + 'message.cpp', + 'object.cpp', + 'semaphore.cpp', + 'signal.cpp', + 'thread.cpp', + 'timer.cpp', 'utils.cpp', ]) libcamera_base_deps = [ + dependency('threads'), ] libcamera_base_lib = shared_library('libcamera-base', diff --git a/src/libcamera/message.cpp b/src/libcamera/base/message.cpp similarity index 96% rename from src/libcamera/message.cpp rename to src/libcamera/base/message.cpp index bc985c077..f1d772e43 100644 --- a/src/libcamera/message.cpp +++ b/src/libcamera/base/message.cpp @@ -5,14 +5,13 @@ * message.cpp - Message queue support */ -#include "libcamera/internal/message.h" +#include -#include - -#include "libcamera/internal/log.h" +#include +#include /** - * \file message.h + * \file base/message.h * \brief Message queue support * * The messaging API enables inter-thread communication through message diff --git a/src/libcamera/object.cpp b/src/libcamera/base/object.cpp similarity index 97% rename from src/libcamera/object.cpp rename to src/libcamera/base/object.cpp index 51cac64ea..25410ecd9 100644 --- a/src/libcamera/object.cpp +++ b/src/libcamera/base/object.cpp @@ -5,21 +5,19 @@ * object.cpp - Base object */ -#include +#include #include -#include - +#include +#include +#include +#include +#include #include -#include "libcamera/internal/log.h" -#include "libcamera/internal/message.h" -#include "libcamera/internal/semaphore.h" -#include "libcamera/internal/thread.h" - /** - * \file object.h + * \file base/object.h * \brief Base object to support automatic signal disconnection */ diff --git a/src/libcamera/semaphore.cpp b/src/libcamera/base/semaphore.cpp similarity index 96% rename from src/libcamera/semaphore.cpp rename to src/libcamera/base/semaphore.cpp index d8988a918..7aedc6a8c 100644 --- a/src/libcamera/semaphore.cpp +++ b/src/libcamera/base/semaphore.cpp @@ -5,11 +5,11 @@ * semaphore.cpp - General-purpose counting semaphore */ -#include "libcamera/internal/semaphore.h" -#include "libcamera/internal/thread.h" +#include +#include /** - * \file semaphore.h + * \file base/semaphore.h * \brief General-purpose counting semaphore */ diff --git a/src/libcamera/signal.cpp b/src/libcamera/base/signal.cpp similarity index 98% rename from src/libcamera/signal.cpp rename to src/libcamera/base/signal.cpp index 2532df3c3..298b2d4b3 100644 --- a/src/libcamera/signal.cpp +++ b/src/libcamera/base/signal.cpp @@ -5,12 +5,12 @@ * signal.cpp - Signal & slot implementation */ -#include +#include -#include "libcamera/internal/thread.h" +#include /** - * \file signal.h + * \file base/signal.h * \brief Signal & slot implementation */ diff --git a/src/libcamera/thread.cpp b/src/libcamera/base/thread.cpp similarity index 98% rename from src/libcamera/thread.cpp rename to src/libcamera/base/thread.cpp index 91e4737ad..c7c2d6b29 100644 --- a/src/libcamera/thread.cpp +++ b/src/libcamera/base/thread.cpp @@ -5,7 +5,7 @@ * thread.cpp - Thread support */ -#include "libcamera/internal/thread.h" +#include #include #include @@ -14,10 +14,10 @@ #include #include -#include "libcamera/internal/event_dispatcher.h" -#include "libcamera/internal/event_dispatcher_poll.h" -#include "libcamera/internal/log.h" -#include "libcamera/internal/message.h" +#include +#include +#include +#include /** * \page thread Thread Support @@ -102,7 +102,7 @@ */ /** - * \file thread.h + * \file base/thread.h * \brief Thread support */ diff --git a/src/libcamera/timer.cpp b/src/libcamera/base/timer.cpp similarity index 94% rename from src/libcamera/timer.cpp rename to src/libcamera/base/timer.cpp index 9496671ed..9c54352d4 100644 --- a/src/libcamera/timer.cpp +++ b/src/libcamera/base/timer.cpp @@ -5,21 +5,20 @@ * timer.cpp - Generic timer */ -#include "libcamera/internal/timer.h" +#include #include -#include - +#include +#include +#include +#include #include -#include "libcamera/internal/event_dispatcher.h" -#include "libcamera/internal/log.h" -#include "libcamera/internal/message.h" -#include "libcamera/internal/thread.h" +#include /** - * \file timer.h + * \file base/timer.h * \brief Generic timer */ diff --git a/src/libcamera/buffer.cpp b/src/libcamera/buffer.cpp index ca999429d..e4c345d51 100644 --- a/src/libcamera/buffer.cpp +++ b/src/libcamera/buffer.cpp @@ -13,7 +13,7 @@ #include #include -#include "libcamera/internal/log.h" +#include /** * \file libcamera/buffer.h diff --git a/src/libcamera/byte_stream_buffer.cpp b/src/libcamera/byte_stream_buffer.cpp index 7fc6f6944..b67bb928f 100644 --- a/src/libcamera/byte_stream_buffer.cpp +++ b/src/libcamera/byte_stream_buffer.cpp @@ -10,7 +10,7 @@ #include #include -#include "libcamera/internal/log.h" +#include /** * \file byte_stream_buffer.h diff --git a/src/libcamera/camera.cpp b/src/libcamera/camera.cpp index 1340c266c..de0123aea 100644 --- a/src/libcamera/camera.cpp +++ b/src/libcamera/camera.cpp @@ -11,13 +11,14 @@ #include #include +#include +#include + #include #include #include -#include "libcamera/internal/log.h" #include "libcamera/internal/pipeline_handler.h" -#include "libcamera/internal/thread.h" /** * \file camera.h diff --git a/src/libcamera/camera_manager.cpp b/src/libcamera/camera_manager.cpp index a3784db6e..fc3bd88c7 100644 --- a/src/libcamera/camera_manager.cpp +++ b/src/libcamera/camera_manager.cpp @@ -14,12 +14,13 @@ #include +#include +#include + #include "libcamera/internal/device_enumerator.h" #include "libcamera/internal/ipa_manager.h" -#include "libcamera/internal/log.h" #include "libcamera/internal/pipeline_handler.h" #include "libcamera/internal/process.h" -#include "libcamera/internal/thread.h" /** * \file camera_manager.h diff --git a/src/libcamera/camera_sensor_properties.cpp b/src/libcamera/camera_sensor_properties.cpp index fc4ea78d1..7b7279efb 100644 --- a/src/libcamera/camera_sensor_properties.cpp +++ b/src/libcamera/camera_sensor_properties.cpp @@ -9,9 +9,9 @@ #include -#include +#include -#include "libcamera/internal/log.h" +#include /** * \file camera_sensor_properties.h diff --git a/src/libcamera/control_serializer.cpp b/src/libcamera/control_serializer.cpp index 097444130..dd5a26083 100644 --- a/src/libcamera/control_serializer.cpp +++ b/src/libcamera/control_serializer.cpp @@ -11,13 +11,14 @@ #include #include +#include + #include #include #include #include #include "libcamera/internal/byte_stream_buffer.h" -#include "libcamera/internal/log.h" /** * \file control_serializer.h diff --git a/src/libcamera/controls.cpp b/src/libcamera/controls.cpp index 7df372ad3..34317fa0f 100644 --- a/src/libcamera/controls.cpp +++ b/src/libcamera/controls.cpp @@ -12,10 +12,10 @@ #include #include +#include #include #include "libcamera/internal/control_validator.h" -#include "libcamera/internal/log.h" /** * \file controls.h diff --git a/src/libcamera/delayed_controls.cpp b/src/libcamera/delayed_controls.cpp index 0bf81b510..90ce7e0b5 100644 --- a/src/libcamera/delayed_controls.cpp +++ b/src/libcamera/delayed_controls.cpp @@ -7,9 +7,10 @@ #include "libcamera/internal/delayed_controls.h" +#include + #include -#include "libcamera/internal/log.h" #include "libcamera/internal/v4l2_device.h" /** diff --git a/src/libcamera/device_enumerator.cpp b/src/libcamera/device_enumerator.cpp index e6ecc360e..1f33faf5e 100644 --- a/src/libcamera/device_enumerator.cpp +++ b/src/libcamera/device_enumerator.cpp @@ -11,7 +11,8 @@ #include -#include "libcamera/internal/log.h" +#include + #include "libcamera/internal/media_device.h" /** diff --git a/src/libcamera/device_enumerator_sysfs.cpp b/src/libcamera/device_enumerator_sysfs.cpp index ff7288528..686bb8099 100644 --- a/src/libcamera/device_enumerator_sysfs.cpp +++ b/src/libcamera/device_enumerator_sysfs.cpp @@ -17,7 +17,8 @@ #include #include -#include "libcamera/internal/log.h" +#include + #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 d26fcf10b..4b842773f 100644 --- a/src/libcamera/device_enumerator_udev.cpp +++ b/src/libcamera/device_enumerator_udev.cpp @@ -17,8 +17,9 @@ #include #include +#include + #include "libcamera/internal/event_notifier.h" -#include "libcamera/internal/log.h" #include "libcamera/internal/media_device.h" namespace libcamera { diff --git a/src/libcamera/event_notifier.cpp b/src/libcamera/event_notifier.cpp index 6b0575c0d..784016a9f 100644 --- a/src/libcamera/event_notifier.cpp +++ b/src/libcamera/event_notifier.cpp @@ -9,9 +9,9 @@ #include -#include "libcamera/internal/event_dispatcher.h" -#include "libcamera/internal/message.h" -#include "libcamera/internal/thread.h" +#include +#include +#include /** * \file event_notifier.h diff --git a/src/libcamera/file.cpp b/src/libcamera/file.cpp index bce2b6138..def0f60d0 100644 --- a/src/libcamera/file.cpp +++ b/src/libcamera/file.cpp @@ -14,7 +14,7 @@ #include #include -#include "libcamera/internal/log.h" +#include /** * \file file.h diff --git a/src/libcamera/file_descriptor.cpp b/src/libcamera/file_descriptor.cpp index 8b505ed3b..638b3bbe0 100644 --- a/src/libcamera/file_descriptor.cpp +++ b/src/libcamera/file_descriptor.cpp @@ -11,7 +11,7 @@ #include #include -#include "libcamera/internal/log.h" +#include /** * \file file_descriptor.h diff --git a/src/libcamera/formats.cpp b/src/libcamera/formats.cpp index 55822f4cc..59a348531 100644 --- a/src/libcamera/formats.cpp +++ b/src/libcamera/formats.cpp @@ -10,9 +10,9 @@ #include #include -#include +#include -#include "libcamera/internal/log.h" +#include /** * \file internal/formats.h diff --git a/src/libcamera/framebuffer_allocator.cpp b/src/libcamera/framebuffer_allocator.cpp index 2fbba37a1..86a579232 100644 --- a/src/libcamera/framebuffer_allocator.cpp +++ b/src/libcamera/framebuffer_allocator.cpp @@ -9,11 +9,12 @@ #include +#include + #include #include #include -#include "libcamera/internal/log.h" #include "libcamera/internal/pipeline_handler.h" /** diff --git a/src/libcamera/geometry.cpp b/src/libcamera/geometry.cpp index 136446895..9bbef0b53 100644 --- a/src/libcamera/geometry.cpp +++ b/src/libcamera/geometry.cpp @@ -10,7 +10,7 @@ #include #include -#include "libcamera/internal/log.h" +#include /** * \file geometry.h diff --git a/src/libcamera/ipa_data_serializer.cpp b/src/libcamera/ipa_data_serializer.cpp index 131b3bd61..fb941e6bc 100644 --- a/src/libcamera/ipa_data_serializer.cpp +++ b/src/libcamera/ipa_data_serializer.cpp @@ -7,7 +7,7 @@ #include "libcamera/internal/ipa_data_serializer.h" -#include "libcamera/internal/log.h" +#include /** * \file ipa_data_serializer.h diff --git a/src/libcamera/ipa_manager.cpp b/src/libcamera/ipa_manager.cpp index 263cacd64..35c725980 100644 --- a/src/libcamera/ipa_manager.cpp +++ b/src/libcamera/ipa_manager.cpp @@ -12,12 +12,12 @@ #include #include +#include #include #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" /** diff --git a/src/libcamera/ipa_module.cpp b/src/libcamera/ipa_module.cpp index a4e7fb861..7ab555791 100644 --- a/src/libcamera/ipa_module.cpp +++ b/src/libcamera/ipa_module.cpp @@ -23,10 +23,10 @@ #include +#include #include #include "libcamera/internal/file.h" -#include "libcamera/internal/log.h" #include "libcamera/internal/pipeline_handler.h" /** diff --git a/src/libcamera/ipa_proxy.cpp b/src/libcamera/ipa_proxy.cpp index ca980ec70..babcc48bc 100644 --- a/src/libcamera/ipa_proxy.cpp +++ b/src/libcamera/ipa_proxy.cpp @@ -12,10 +12,10 @@ #include #include +#include #include #include "libcamera/internal/ipa_module.h" -#include "libcamera/internal/log.h" /** * \file ipa_proxy.h diff --git a/src/libcamera/ipc_pipe.cpp b/src/libcamera/ipc_pipe.cpp index c402c8d08..28e20e031 100644 --- a/src/libcamera/ipc_pipe.cpp +++ b/src/libcamera/ipc_pipe.cpp @@ -7,7 +7,7 @@ #include "libcamera/internal/ipc_pipe.h" -#include "libcamera/internal/log.h" +#include /** * \file ipc_pipe.h diff --git a/src/libcamera/ipc_pipe_unixsocket.cpp b/src/libcamera/ipc_pipe_unixsocket.cpp index db0e260f2..4511775fb 100644 --- a/src/libcamera/ipc_pipe_unixsocket.cpp +++ b/src/libcamera/ipc_pipe_unixsocket.cpp @@ -9,13 +9,14 @@ #include -#include "libcamera/internal/event_dispatcher.h" +#include +#include +#include +#include + #include "libcamera/internal/ipc_pipe.h" #include "libcamera/internal/ipc_unixsocket.h" -#include "libcamera/internal/log.h" #include "libcamera/internal/process.h" -#include "libcamera/internal/thread.h" -#include "libcamera/internal/timer.h" namespace libcamera { diff --git a/src/libcamera/ipc_unixsocket.cpp b/src/libcamera/ipc_unixsocket.cpp index fdb359f7f..146659707 100644 --- a/src/libcamera/ipc_unixsocket.cpp +++ b/src/libcamera/ipc_unixsocket.cpp @@ -12,8 +12,9 @@ #include #include +#include + #include "libcamera/internal/event_notifier.h" -#include "libcamera/internal/log.h" /** * \file ipc_unixsocket.h diff --git a/src/libcamera/media_device.cpp b/src/libcamera/media_device.cpp index 9ec84e560..e12ab1abb 100644 --- a/src/libcamera/media_device.cpp +++ b/src/libcamera/media_device.cpp @@ -18,7 +18,7 @@ #include -#include "libcamera/internal/log.h" +#include /** * \file media_device.h diff --git a/src/libcamera/media_object.cpp b/src/libcamera/media_object.cpp index 94aeb5040..815edc8e3 100644 --- a/src/libcamera/media_object.cpp +++ b/src/libcamera/media_object.cpp @@ -15,7 +15,8 @@ #include -#include "libcamera/internal/log.h" +#include + #include "libcamera/internal/media_device.h" /** diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build index e1252ce42..e915266a9 100644 --- a/src/libcamera/meson.build +++ b/src/libcamera/meson.build @@ -2,7 +2,6 @@ libcamera_sources = files([ 'bayer_format.cpp', - 'bound_method.cpp', 'buffer.cpp', 'byte_stream_buffer.cpp', 'camera.cpp', @@ -16,8 +15,6 @@ libcamera_sources = files([ 'delayed_controls.cpp', 'device_enumerator.cpp', 'device_enumerator_sysfs.cpp', - 'event_dispatcher.cpp', - 'event_dispatcher_poll.cpp', 'event_notifier.cpp', 'file.cpp', 'file_descriptor.cpp', @@ -33,23 +30,16 @@ libcamera_sources = files([ 'ipc_pipe.cpp', 'ipc_pipe_unixsocket.cpp', 'ipc_unixsocket.cpp', - 'log.cpp', 'media_device.cpp', 'media_object.cpp', - 'message.cpp', - 'object.cpp', 'pipeline_handler.cpp', 'pixel_format.cpp', 'process.cpp', 'pub_key.cpp', 'request.cpp', - 'semaphore.cpp', - 'signal.cpp', 'source_paths.cpp', 'stream.cpp', 'sysfs.cpp', - 'thread.cpp', - 'timer.cpp', 'transform.cpp', 'v4l2_device.cpp', 'v4l2_pixelformat.cpp', @@ -128,7 +118,6 @@ libcamera_deps = [ libgnutls, liblttng, libudev, - dependency('threads'), ] # We add '/' to the build_rpath as a 'safe' path to act as a boolean flag. diff --git a/src/libcamera/pipeline/ipu3/cio2.h b/src/libcamera/pipeline/ipu3/cio2.h index d8d4a181f..f28e9f1dd 100644 --- a/src/libcamera/pipeline/ipu3/cio2.h +++ b/src/libcamera/pipeline/ipu3/cio2.h @@ -11,7 +11,7 @@ #include #include -#include +#include #include "libcamera/internal/v4l2_subdevice.h" #include "libcamera/internal/v4l2_videodevice.h" diff --git a/src/libcamera/pipeline/ipu3/frames.h b/src/libcamera/pipeline/ipu3/frames.h index 59e64e817..3ef7e4454 100644 --- a/src/libcamera/pipeline/ipu3/frames.h +++ b/src/libcamera/pipeline/ipu3/frames.h @@ -12,7 +12,7 @@ #include #include -#include +#include namespace libcamera { diff --git a/src/libcamera/pipeline/ipu3/imgu.cpp b/src/libcamera/pipeline/ipu3/imgu.cpp index 32d143a86..e955bc345 100644 --- a/src/libcamera/pipeline/ipu3/imgu.cpp +++ b/src/libcamera/pipeline/ipu3/imgu.cpp @@ -13,12 +13,12 @@ #include +#include +#include + #include #include -#include - -#include "libcamera/internal/log.h" #include "libcamera/internal/media_device.h" namespace libcamera { diff --git a/src/libcamera/pipeline/ipu3/ipu3.cpp b/src/libcamera/pipeline/ipu3/ipu3.cpp index 6b43ad2fb..76c3bb3d8 100644 --- a/src/libcamera/pipeline/ipu3/ipu3.cpp +++ b/src/libcamera/pipeline/ipu3/ipu3.cpp @@ -11,6 +11,9 @@ #include #include +#include +#include + #include #include #include @@ -20,13 +23,10 @@ #include #include -#include - #include "libcamera/internal/camera_sensor.h" #include "libcamera/internal/delayed_controls.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" diff --git a/src/libcamera/pipeline/raspberrypi/dma_heaps.cpp b/src/libcamera/pipeline/raspberrypi/dma_heaps.cpp index 4d5dd6cb8..573ea11de 100644 --- a/src/libcamera/pipeline/raspberrypi/dma_heaps.cpp +++ b/src/libcamera/pipeline/raspberrypi/dma_heaps.cpp @@ -14,7 +14,7 @@ #include #include -#include "libcamera/internal/log.h" +#include /* * /dev/dma-heap/linux,cma is the dma-heap allocator, which allows dmaheap-cma diff --git a/src/libcamera/pipeline/raspberrypi/rpi_stream.cpp b/src/libcamera/pipeline/raspberrypi/rpi_stream.cpp index f2430415d..b3265d0e8 100644 --- a/src/libcamera/pipeline/raspberrypi/rpi_stream.cpp +++ b/src/libcamera/pipeline/raspberrypi/rpi_stream.cpp @@ -6,9 +6,9 @@ */ #include "rpi_stream.h" -#include +#include -#include "libcamera/internal/log.h" +#include namespace libcamera { diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp index c625d7248..00df4f0b3 100644 --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp @@ -14,6 +14,9 @@ #include +#include +#include + #include #include #include @@ -24,13 +27,10 @@ #include #include -#include - #include "libcamera/internal/camera_sensor.h" #include "libcamera/internal/delayed_controls.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/v4l2_subdevice.h" diff --git a/src/libcamera/pipeline/rkisp1/rkisp1_path.h b/src/libcamera/pipeline/rkisp1/rkisp1_path.h index 3b3e37d25..c185ac399 100644 --- a/src/libcamera/pipeline/rkisp1/rkisp1_path.h +++ b/src/libcamera/pipeline/rkisp1/rkisp1_path.h @@ -10,10 +10,11 @@ #include #include +#include + #include #include #include -#include #include #include "libcamera/internal/media_object.h" diff --git a/src/libcamera/pipeline/simple/converter.cpp b/src/libcamera/pipeline/simple/converter.cpp index 589f185b1..9af1096be 100644 --- a/src/libcamera/pipeline/simple/converter.cpp +++ b/src/libcamera/pipeline/simple/converter.cpp @@ -10,14 +10,14 @@ #include #include -#include -#include -#include -#include - +#include +#include #include -#include "libcamera/internal/log.h" +#include +#include +#include + #include "libcamera/internal/media_device.h" #include "libcamera/internal/v4l2_videodevice.h" diff --git a/src/libcamera/pipeline/simple/converter.h b/src/libcamera/pipeline/simple/converter.h index 480e528d2..276a2a291 100644 --- a/src/libcamera/pipeline/simple/converter.h +++ b/src/libcamera/pipeline/simple/converter.h @@ -16,9 +16,9 @@ #include #include -#include -#include "libcamera/internal/log.h" +#include +#include namespace libcamera { diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp index 1894014d8..4d78e6faf 100644 --- a/src/libcamera/pipeline/simple/simple.cpp +++ b/src/libcamera/pipeline/simple/simple.cpp @@ -21,6 +21,8 @@ #include +#include + #include #include #include @@ -28,7 +30,6 @@ #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" diff --git a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp index d8c17dcca..0f634b8da 100644 --- a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp +++ b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp @@ -12,6 +12,9 @@ #include #include +#include +#include + #include #include #include @@ -19,10 +22,7 @@ #include #include -#include - #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/sysfs.h" diff --git a/src/libcamera/pipeline/vimc/vimc.cpp b/src/libcamera/pipeline/vimc/vimc.cpp index 025ca5620..12f7517fd 100644 --- a/src/libcamera/pipeline/vimc/vimc.cpp +++ b/src/libcamera/pipeline/vimc/vimc.cpp @@ -14,29 +14,29 @@ #include #include +#include +#include + #include #include #include #include -#include -#include #include #include -#include +#include +#include +#include +#include #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/v4l2_subdevice.h" #include "libcamera/internal/v4l2_videodevice.h" -#include -#include - namespace libcamera { LOG_DEFINE_CATEGORY(VIMC) diff --git a/src/libcamera/pipeline_handler.cpp b/src/libcamera/pipeline_handler.cpp index 6fb2a743c..f626eddd3 100644 --- a/src/libcamera/pipeline_handler.cpp +++ b/src/libcamera/pipeline_handler.cpp @@ -9,14 +9,14 @@ #include +#include +#include + #include #include #include -#include - #include "libcamera/internal/device_enumerator.h" -#include "libcamera/internal/log.h" #include "libcamera/internal/media_device.h" #include "libcamera/internal/tracepoints.h" diff --git a/src/libcamera/process.cpp b/src/libcamera/process.cpp index 35091f60c..463380299 100644 --- a/src/libcamera/process.cpp +++ b/src/libcamera/process.cpp @@ -20,10 +20,10 @@ #include #include +#include #include #include "libcamera/internal/event_notifier.h" -#include "libcamera/internal/log.h" /** * \file process.h diff --git a/src/libcamera/request.cpp b/src/libcamera/request.cpp index 6611e74d1..518384eb8 100644 --- a/src/libcamera/request.cpp +++ b/src/libcamera/request.cpp @@ -10,13 +10,14 @@ #include #include +#include + #include #include #include #include #include "libcamera/internal/camera_controls.h" -#include "libcamera/internal/log.h" #include "libcamera/internal/tracepoints.h" /** diff --git a/src/libcamera/stream.cpp b/src/libcamera/stream.cpp index d5d68427e..b8626775d 100644 --- a/src/libcamera/stream.cpp +++ b/src/libcamera/stream.cpp @@ -15,9 +15,9 @@ #include +#include #include -#include "libcamera/internal/log.h" /** * \file stream.h diff --git a/src/libcamera/sysfs.cpp b/src/libcamera/sysfs.cpp index e9004b2b5..4372b1348 100644 --- a/src/libcamera/sysfs.cpp +++ b/src/libcamera/sysfs.cpp @@ -12,8 +12,9 @@ #include #include +#include + #include "libcamera/internal/file.h" -#include "libcamera/internal/log.h" /** * \file sysfs.h diff --git a/src/libcamera/v4l2_device.cpp b/src/libcamera/v4l2_device.cpp index facb53e13..334b9b78b 100644 --- a/src/libcamera/v4l2_device.cpp +++ b/src/libcamera/v4l2_device.cpp @@ -16,10 +16,10 @@ #include #include +#include #include #include "libcamera/internal/event_notifier.h" -#include "libcamera/internal/log.h" #include "libcamera/internal/sysfs.h" /** diff --git a/src/libcamera/v4l2_pixelformat.cpp b/src/libcamera/v4l2_pixelformat.cpp index 166d93cf1..87d728fe5 100644 --- a/src/libcamera/v4l2_pixelformat.cpp +++ b/src/libcamera/v4l2_pixelformat.cpp @@ -12,11 +12,12 @@ #include #include +#include + #include #include #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 2c56cfafb..8fe5e45b3 100644 --- a/src/libcamera/v4l2_subdevice.cpp +++ b/src/libcamera/v4l2_subdevice.cpp @@ -19,9 +19,9 @@ #include +#include #include -#include "libcamera/internal/log.h" #include "libcamera/internal/media_device.h" #include "libcamera/internal/media_object.h" diff --git a/src/libcamera/v4l2_videodevice.cpp b/src/libcamera/v4l2_videodevice.cpp index 12c09dc75..dc23510bc 100644 --- a/src/libcamera/v4l2_videodevice.cpp +++ b/src/libcamera/v4l2_videodevice.cpp @@ -21,10 +21,11 @@ #include +#include + #include #include "libcamera/internal/event_notifier.h" -#include "libcamera/internal/log.h" #include "libcamera/internal/media_device.h" #include "libcamera/internal/media_object.h" diff --git a/src/v4l2/v4l2_camera.cpp b/src/v4l2/v4l2_camera.cpp index 97825c715..157ab94e0 100644 --- a/src/v4l2/v4l2_camera.cpp +++ b/src/v4l2/v4l2_camera.cpp @@ -10,7 +10,7 @@ #include #include -#include "libcamera/internal/log.h" +#include using namespace libcamera; diff --git a/src/v4l2/v4l2_camera.h b/src/v4l2/v4l2_camera.h index d23804625..dbe0573bd 100644 --- a/src/v4l2/v4l2_camera.h +++ b/src/v4l2/v4l2_camera.h @@ -12,13 +12,13 @@ #include #include +#include + #include #include #include #include -#include "libcamera/internal/semaphore.h" - using namespace libcamera; class V4L2Camera diff --git a/src/v4l2/v4l2_camera_proxy.cpp b/src/v4l2/v4l2_camera_proxy.cpp index a5a255074..7682c4bdd 100644 --- a/src/v4l2/v4l2_camera_proxy.cpp +++ b/src/v4l2/v4l2_camera_proxy.cpp @@ -18,12 +18,12 @@ #include #include -#include +#include +#include #include #include "libcamera/internal/formats.h" -#include "libcamera/internal/log.h" #include "v4l2_camera.h" #include "v4l2_camera_file.h" diff --git a/src/v4l2/v4l2_compat_manager.cpp b/src/v4l2/v4l2_compat_manager.cpp index 27de6c50f..e566125a7 100644 --- a/src/v4l2/v4l2_compat_manager.cpp +++ b/src/v4l2/v4l2_compat_manager.cpp @@ -19,12 +19,11 @@ #include #include -#include -#include - +#include #include -#include "libcamera/internal/log.h" +#include +#include #include "v4l2_camera_file.h" diff --git a/test/camera/buffer_import.cpp b/test/camera/buffer_import.cpp index 61f4eb92a..c504ea09e 100644 --- a/test/camera/buffer_import.cpp +++ b/test/camera/buffer_import.cpp @@ -12,11 +12,12 @@ #include #include +#include +#include +#include + #include "libcamera/internal/device_enumerator.h" -#include "libcamera/internal/event_dispatcher.h" #include "libcamera/internal/media_device.h" -#include "libcamera/internal/thread.h" -#include "libcamera/internal/timer.h" #include "libcamera/internal/v4l2_videodevice.h" #include "buffer_source.h" diff --git a/test/camera/capture.cpp b/test/camera/capture.cpp index c4bc21100..238d98dbb 100644 --- a/test/camera/capture.cpp +++ b/test/camera/capture.cpp @@ -9,9 +9,9 @@ #include -#include "libcamera/internal/event_dispatcher.h" -#include "libcamera/internal/thread.h" -#include "libcamera/internal/timer.h" +#include +#include +#include #include "camera_test.h" #include "test.h" diff --git a/test/event-dispatcher.cpp b/test/event-dispatcher.cpp index 8ae05ac62..1cc17b045 100644 --- a/test/event-dispatcher.cpp +++ b/test/event-dispatcher.cpp @@ -10,9 +10,9 @@ #include #include -#include "libcamera/internal/event_dispatcher.h" -#include "libcamera/internal/thread.h" -#include "libcamera/internal/timer.h" +#include +#include +#include #include "test.h" diff --git a/test/event-thread.cpp b/test/event-thread.cpp index aeb8b3bf4..05c5d26d3 100644 --- a/test/event-thread.cpp +++ b/test/event-thread.cpp @@ -10,9 +10,10 @@ #include #include +#include +#include + #include "libcamera/internal/event_notifier.h" -#include "libcamera/internal/thread.h" -#include "libcamera/internal/timer.h" #include "test.h" diff --git a/test/event.cpp b/test/event.cpp index 1f16c97bb..aa79da99c 100644 --- a/test/event.cpp +++ b/test/event.cpp @@ -9,10 +9,11 @@ #include #include -#include "libcamera/internal/event_dispatcher.h" +#include +#include +#include + #include "libcamera/internal/event_notifier.h" -#include "libcamera/internal/thread.h" -#include "libcamera/internal/timer.h" #include "test.h" diff --git a/test/hotplug-cameras.cpp b/test/hotplug-cameras.cpp index 94cb85935..bb160537c 100644 --- a/test/hotplug-cameras.cpp +++ b/test/hotplug-cameras.cpp @@ -14,10 +14,11 @@ #include #include -#include "libcamera/internal/event_dispatcher.h" +#include +#include +#include + #include "libcamera/internal/file.h" -#include "libcamera/internal/thread.h" -#include "libcamera/internal/timer.h" #include "test.h" diff --git a/test/ipa/ipa_interface_test.cpp b/test/ipa/ipa_interface_test.cpp index d6ca6f513..656d86552 100644 --- a/test/ipa/ipa_interface_test.cpp +++ b/test/ipa/ipa_interface_test.cpp @@ -14,15 +14,16 @@ #include +#include +#include +#include + #include "libcamera/internal/device_enumerator.h" -#include "libcamera/internal/event_dispatcher.h" #include "libcamera/internal/event_notifier.h" #include "libcamera/internal/ipa_manager.h" #include "libcamera/internal/ipa_module.h" #include "libcamera/internal/pipeline_handler.h" #include "libcamera/internal/process.h" -#include "libcamera/internal/thread.h" -#include "libcamera/internal/timer.h" #include "test.h" diff --git a/test/ipc/unixsocket.cpp b/test/ipc/unixsocket.cpp index 80157b342..aa35c8f07 100644 --- a/test/ipc/unixsocket.cpp +++ b/test/ipc/unixsocket.cpp @@ -16,10 +16,11 @@ #include #include -#include "libcamera/internal/event_dispatcher.h" +#include +#include +#include + #include "libcamera/internal/ipc_unixsocket.h" -#include "libcamera/internal/thread.h" -#include "libcamera/internal/timer.h" #include "test.h" diff --git a/test/ipc/unixsocket_ipc.cpp b/test/ipc/unixsocket_ipc.cpp index 161d09b98..6fe7fd9b8 100644 --- a/test/ipc/unixsocket_ipc.cpp +++ b/test/ipc/unixsocket_ipc.cpp @@ -15,19 +15,18 @@ #include #include +#include +#include +#include #include -#include "libcamera/internal/event_dispatcher.h" #include "libcamera/internal/ipa_data_serializer.h" #include "libcamera/internal/ipc_pipe.h" #include "libcamera/internal/ipc_pipe_unixsocket.h" #include "libcamera/internal/process.h" -#include "libcamera/internal/thread.h" -#include "libcamera/internal/timer.h" #include "test.h" - using namespace std; using namespace libcamera; diff --git a/test/log/log_api.cpp b/test/log/log_api.cpp index ae3c607a6..531189609 100644 --- a/test/log/log_api.cpp +++ b/test/log/log_api.cpp @@ -16,9 +16,9 @@ #include #include -#include +#include -#include "libcamera/internal/log.h" +#include #include "test.h" diff --git a/test/log/log_process.cpp b/test/log/log_process.cpp index 413d9207e..d138aa7ff 100644 --- a/test/log/log_process.cpp +++ b/test/log/log_process.cpp @@ -16,13 +16,13 @@ #include +#include +#include +#include +#include #include -#include "libcamera/internal/event_dispatcher.h" -#include "libcamera/internal/log.h" #include "libcamera/internal/process.h" -#include "libcamera/internal/thread.h" -#include "libcamera/internal/timer.h" #include "test.h" diff --git a/test/message.cpp b/test/message.cpp index 9553ba8cb..eeea57fea 100644 --- a/test/message.cpp +++ b/test/message.cpp @@ -9,8 +9,8 @@ #include #include -#include "libcamera/internal/message.h" -#include "libcamera/internal/thread.h" +#include +#include #include "test.h" diff --git a/test/object-delete.cpp b/test/object-delete.cpp index a1a6f5cce..eabefe935 100644 --- a/test/object-delete.cpp +++ b/test/object-delete.cpp @@ -7,9 +7,8 @@ #include -#include - -#include "libcamera/internal/thread.h" +#include +#include #include "test.h" diff --git a/test/object-invoke.cpp b/test/object-invoke.cpp index a6f816f39..b1c0f473b 100644 --- a/test/object-invoke.cpp +++ b/test/object-invoke.cpp @@ -8,10 +8,9 @@ #include #include -#include - -#include "libcamera/internal/event_dispatcher.h" -#include "libcamera/internal/thread.h" +#include +#include +#include #include "test.h" diff --git a/test/object.cpp b/test/object.cpp index 264659b40..cbd0d3ece 100644 --- a/test/object.cpp +++ b/test/object.cpp @@ -7,10 +7,9 @@ #include -#include - -#include "libcamera/internal/message.h" -#include "libcamera/internal/thread.h" +#include +#include +#include #include "test.h" diff --git a/test/process/process_test.cpp b/test/process/process_test.cpp index a5155bae3..8f7a1f05f 100644 --- a/test/process/process_test.cpp +++ b/test/process/process_test.cpp @@ -9,12 +9,13 @@ #include #include + +#include +#include +#include #include -#include "libcamera/internal/event_dispatcher.h" #include "libcamera/internal/process.h" -#include "libcamera/internal/thread.h" -#include "libcamera/internal/timer.h" #include "test.h" diff --git a/test/serialization/ipa_data_serializer_test.cpp b/test/serialization/ipa_data_serializer_test.cpp index dbbba8912..880bcd02c 100644 --- a/test/serialization/ipa_data_serializer_test.cpp +++ b/test/serialization/ipa_data_serializer_test.cpp @@ -17,13 +17,14 @@ #include #include +#include +#include + #include "libcamera/internal/device_enumerator.h" #include "libcamera/internal/ipa_data_serializer.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 "libcamera/internal/timer.h" #include "serialization_test.h" #include "test.h" diff --git a/test/signal-threads.cpp b/test/signal-threads.cpp index 8a96b5d2a..d5e2eb662 100644 --- a/test/signal-threads.cpp +++ b/test/signal-threads.cpp @@ -9,11 +9,10 @@ #include #include +#include +#include #include -#include "libcamera/internal/message.h" -#include "libcamera/internal/thread.h" - #include "test.h" using namespace std; diff --git a/test/signal.cpp b/test/signal.cpp index f83ceb05f..aceb02789 100644 --- a/test/signal.cpp +++ b/test/signal.cpp @@ -8,8 +8,8 @@ #include #include -#include -#include +#include +#include #include "test.h" diff --git a/test/threads.cpp b/test/threads.cpp index e0c50dc90..d83b58339 100644 --- a/test/threads.cpp +++ b/test/threads.cpp @@ -10,7 +10,7 @@ #include #include -#include "libcamera/internal/thread.h" +#include #include "test.h" diff --git a/test/timer-thread.cpp b/test/timer-thread.cpp index be29eee1b..2c14865b7 100644 --- a/test/timer-thread.cpp +++ b/test/timer-thread.cpp @@ -8,9 +8,9 @@ #include #include -#include "libcamera/internal/event_dispatcher.h" -#include "libcamera/internal/thread.h" -#include "libcamera/internal/timer.h" +#include +#include +#include #include "test.h" diff --git a/test/timer.cpp b/test/timer.cpp index fc90b1104..88f226e79 100644 --- a/test/timer.cpp +++ b/test/timer.cpp @@ -8,9 +8,9 @@ #include #include -#include "libcamera/internal/event_dispatcher.h" -#include "libcamera/internal/thread.h" -#include "libcamera/internal/timer.h" +#include +#include +#include #include "test.h" diff --git a/test/v4l2_videodevice/buffer_sharing.cpp b/test/v4l2_videodevice/buffer_sharing.cpp index c75259be0..91b3e4a0d 100644 --- a/test/v4l2_videodevice/buffer_sharing.cpp +++ b/test/v4l2_videodevice/buffer_sharing.cpp @@ -14,9 +14,9 @@ #include -#include "libcamera/internal/event_dispatcher.h" -#include "libcamera/internal/thread.h" -#include "libcamera/internal/timer.h" +#include +#include +#include #include "v4l2_videodevice_test.h" diff --git a/test/v4l2_videodevice/capture_async.cpp b/test/v4l2_videodevice/capture_async.cpp index accdb34a6..f12c8bef9 100644 --- a/test/v4l2_videodevice/capture_async.cpp +++ b/test/v4l2_videodevice/capture_async.cpp @@ -9,9 +9,9 @@ #include -#include "libcamera/internal/event_dispatcher.h" -#include "libcamera/internal/thread.h" -#include "libcamera/internal/timer.h" +#include +#include +#include #include "v4l2_videodevice_test.h" diff --git a/test/v4l2_videodevice/v4l2_m2mdevice.cpp b/test/v4l2_videodevice/v4l2_m2mdevice.cpp index e0f068082..fe4b3cc64 100644 --- a/test/v4l2_videodevice/v4l2_m2mdevice.cpp +++ b/test/v4l2_videodevice/v4l2_m2mdevice.cpp @@ -9,11 +9,12 @@ #include +#include +#include +#include + #include "libcamera/internal/device_enumerator.h" -#include "libcamera/internal/event_dispatcher.h" #include "libcamera/internal/media_device.h" -#include "libcamera/internal/thread.h" -#include "libcamera/internal/timer.h" #include "libcamera/internal/v4l2_videodevice.h" #include "test.h" diff --git a/utils/ipc/generators/libcamera_templates/module_ipa_proxy.cpp.tmpl b/utils/ipc/generators/libcamera_templates/module_ipa_proxy.cpp.tmpl index dc6748153..5a64fe9cf 100644 --- a/utils/ipc/generators/libcamera_templates/module_ipa_proxy.cpp.tmpl +++ b/utils/ipc/generators/libcamera_templates/module_ipa_proxy.cpp.tmpl @@ -23,6 +23,9 @@ #include #include +#include +#include + #include "libcamera/internal/control_serializer.h" #include "libcamera/internal/ipa_data_serializer.h" #include "libcamera/internal/ipa_module.h" @@ -30,9 +33,7 @@ #include "libcamera/internal/ipc_pipe.h" #include "libcamera/internal/ipc_pipe_unixsocket.h" #include "libcamera/internal/ipc_unixsocket.h" -#include "libcamera/internal/log.h" #include "libcamera/internal/process.h" -#include "libcamera/internal/thread.h" namespace libcamera { diff --git a/utils/ipc/generators/libcamera_templates/module_ipa_proxy.h.tmpl b/utils/ipc/generators/libcamera_templates/module_ipa_proxy.h.tmpl index 017b870c9..ae1685484 100644 --- a/utils/ipc/generators/libcamera_templates/module_ipa_proxy.h.tmpl +++ b/utils/ipc/generators/libcamera_templates/module_ipa_proxy.h.tmpl @@ -19,12 +19,13 @@ #include #include +#include + #include "libcamera/internal/control_serializer.h" #include "libcamera/internal/ipa_proxy.h" #include "libcamera/internal/ipc_pipe.h" #include "libcamera/internal/ipc_pipe_unixsocket.h" #include "libcamera/internal/ipc_unixsocket.h" -#include "libcamera/internal/thread.h" namespace libcamera { {%- if has_namespace %} diff --git a/utils/ipc/generators/libcamera_templates/module_ipa_proxy_worker.cpp.tmpl b/utils/ipc/generators/libcamera_templates/module_ipa_proxy_worker.cpp.tmpl index 8a57b6cc8..d993e39e5 100644 --- a/utils/ipc/generators/libcamera_templates/module_ipa_proxy_worker.cpp.tmpl +++ b/utils/ipc/generators/libcamera_templates/module_ipa_proxy_worker.cpp.tmpl @@ -26,17 +26,18 @@ #include #include +#include +#include +#include + #include "libcamera/internal/camera_sensor.h" #include "libcamera/internal/control_serializer.h" -#include "libcamera/internal/event_dispatcher.h" #include "libcamera/internal/ipa_data_serializer.h" #include "libcamera/internal/ipa_module.h" #include "libcamera/internal/ipa_proxy.h" #include "libcamera/internal/ipc_pipe.h" #include "libcamera/internal/ipc_pipe_unixsocket.h" #include "libcamera/internal/ipc_unixsocket.h" -#include "libcamera/internal/log.h" -#include "libcamera/internal/thread.h" using namespace libcamera;