diff options
36 files changed, 54 insertions, 113 deletions
diff --git a/include/libcamera/camera_manager.h b/include/libcamera/camera_manager.h index 6d5341c7..8c8830e7 100644 --- a/include/libcamera/camera_manager.h +++ b/include/libcamera/camera_manager.h @@ -19,7 +19,6 @@ namespace libcamera { class Camera; -class EventDispatcher; class CameraManager : public Object, public Extensible { @@ -43,9 +42,6 @@ public: static const std::string &version() { return version_; } - void setEventDispatcher(std::unique_ptr<EventDispatcher> dispatcher); - EventDispatcher *eventDispatcher(); - Signal<std::shared_ptr<Camera>> cameraAdded; Signal<std::shared_ptr<Camera>> cameraRemoved; diff --git a/include/libcamera/event_dispatcher.h b/include/libcamera/internal/event_dispatcher.h index cb06bf20..cb06bf20 100644 --- a/include/libcamera/event_dispatcher.h +++ b/include/libcamera/internal/event_dispatcher.h diff --git a/include/libcamera/internal/event_dispatcher_poll.h b/include/libcamera/internal/event_dispatcher_poll.h index 39d9be52..33de051d 100644 --- a/include/libcamera/internal/event_dispatcher_poll.h +++ b/include/libcamera/internal/event_dispatcher_poll.h @@ -11,7 +11,7 @@ #include <map> #include <vector> -#include <libcamera/event_dispatcher.h> +#include "libcamera/internal/event_dispatcher.h" struct pollfd; diff --git a/include/libcamera/event_notifier.h b/include/libcamera/internal/event_notifier.h index a37b02ee..a37b02ee 100644 --- a/include/libcamera/event_notifier.h +++ b/include/libcamera/internal/event_notifier.h diff --git a/include/libcamera/internal/meson.build b/include/libcamera/internal/meson.build index 6500fe2a..7cde023f 100644 --- a/include/libcamera/internal/meson.build +++ b/include/libcamera/internal/meson.build @@ -18,7 +18,9 @@ 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', 'ipa_context_wrapper.h', @@ -36,6 +38,7 @@ libcamera_internal_headers = files([ 'semaphore.h', 'sysfs.h', 'thread.h', + 'timer.h', 'utils.h', 'v4l2_controls.h', 'v4l2_device.h', diff --git a/include/libcamera/timer.h b/include/libcamera/internal/timer.h index f55fe3c0..f55fe3c0 100644 --- a/include/libcamera/timer.h +++ b/include/libcamera/internal/timer.h diff --git a/include/libcamera/meson.build b/include/libcamera/meson.build index 0b891a8f..cf2935f1 100644 --- a/include/libcamera/meson.build +++ b/include/libcamera/meson.build @@ -6,8 +6,6 @@ libcamera_public_headers = files([ 'camera.h', 'camera_manager.h', 'controls.h', - 'event_dispatcher.h', - 'event_notifier.h', 'extensible.h', 'file_descriptor.h', 'framebuffer_allocator.h', @@ -19,7 +17,6 @@ libcamera_public_headers = files([ 'signal.h', 'span.h', 'stream.h', - 'timer.h', 'transform.h', ]) diff --git a/src/libcamera/camera_manager.cpp b/src/libcamera/camera_manager.cpp index 427ea5da..67641a55 100644 --- a/src/libcamera/camera_manager.cpp +++ b/src/libcamera/camera_manager.cpp @@ -11,10 +11,8 @@ #include <map> #include <libcamera/camera.h> -#include <libcamera/event_dispatcher.h> #include "libcamera/internal/device_enumerator.h" -#include "libcamera/internal/event_dispatcher_poll.h" #include "libcamera/internal/ipa_manager.h" #include "libcamera/internal/log.h" #include "libcamera/internal/pipeline_handler.h" @@ -244,12 +242,8 @@ void CameraManager::Private::removeCamera(Camera *camera) * a time. Attempting to create a second instance without first deleting the * existing instance results in undefined behaviour. * - * The manager is initially stopped, and shall be configured before being - * started. In particular a custom event dispatcher shall be installed if - * needed with CameraManager::setEventDispatcher(). - * - * Once the camera manager is configured, it shall be started with start(). - * This will enumerate all the cameras present in the system, which can then be + * The manager is initially stopped, and shall be started with start(). This + * will enumerate all the cameras present in the system, which can then be * listed with list() and retrieved with get(). * * Cameras are shared through std::shared_ptr<>, ensuring that a camera will @@ -477,38 +471,4 @@ void CameraManager::removeCamera(std::shared_ptr<Camera> camera) * \return The libcamera version string */ -/** - * \brief Set the event dispatcher - * \param[in] dispatcher Pointer to the event dispatcher - * - * libcamera requires an event dispatcher to integrate event notification and - * timers with the application event loop. Applications that want to provide - * their own event dispatcher shall call this function once and only once before - * the camera manager is started with start(). If no event dispatcher is - * provided, a default poll-based implementation will be used. - * - * The CameraManager takes ownership of the event dispatcher and will delete it - * when the application terminates. - */ -void CameraManager::setEventDispatcher(std::unique_ptr<EventDispatcher> dispatcher) -{ - thread()->setEventDispatcher(std::move(dispatcher)); -} - -/** - * \brief Retrieve the event dispatcher - * - * This function retrieves the event dispatcher set with setEventDispatcher(). - * If no dispatcher has been set, a default poll-based implementation is created - * and returned, and no custom event dispatcher may be installed anymore. - * - * The returned event dispatcher is valid until the camera manager is destroyed. - * - * \return Pointer to the event dispatcher - */ -EventDispatcher *CameraManager::eventDispatcher() -{ - return thread()->eventDispatcher(); -} - } /* namespace libcamera */ diff --git a/src/libcamera/device_enumerator_udev.cpp b/src/libcamera/device_enumerator_udev.cpp index c6e23a1a..d26fcf10 100644 --- a/src/libcamera/device_enumerator_udev.cpp +++ b/src/libcamera/device_enumerator_udev.cpp @@ -17,8 +17,7 @@ #include <sys/sysmacros.h> #include <unistd.h> -#include <libcamera/event_notifier.h> - +#include "libcamera/internal/event_notifier.h" #include "libcamera/internal/log.h" #include "libcamera/internal/media_device.h" diff --git a/src/libcamera/event_dispatcher.cpp b/src/libcamera/event_dispatcher.cpp index 90bd5daf..e0ce1eb3 100644 --- a/src/libcamera/event_dispatcher.cpp +++ b/src/libcamera/event_dispatcher.cpp @@ -5,7 +5,7 @@ * event_dispatcher.cpp - Event dispatcher */ -#include <libcamera/event_dispatcher.h> +#include "libcamera/internal/event_dispatcher.h" #include "libcamera/internal/log.h" diff --git a/src/libcamera/event_dispatcher_poll.cpp b/src/libcamera/event_dispatcher_poll.cpp index 9ab85da7..456c6def 100644 --- a/src/libcamera/event_dispatcher_poll.cpp +++ b/src/libcamera/event_dispatcher_poll.cpp @@ -16,11 +16,10 @@ #include <sys/eventfd.h> #include <unistd.h> -#include <libcamera/event_notifier.h> -#include <libcamera/timer.h> - +#include "libcamera/internal/event_notifier.h" #include "libcamera/internal/log.h" #include "libcamera/internal/thread.h" +#include "libcamera/internal/timer.h" #include "libcamera/internal/utils.h" /** diff --git a/src/libcamera/event_notifier.cpp b/src/libcamera/event_notifier.cpp index 21c07faf..6b0575c0 100644 --- a/src/libcamera/event_notifier.cpp +++ b/src/libcamera/event_notifier.cpp @@ -5,11 +5,11 @@ * event_notifier.cpp - File descriptor event notifier */ -#include <libcamera/event_notifier.h> +#include "libcamera/internal/event_notifier.h" #include <libcamera/camera_manager.h> -#include <libcamera/event_dispatcher.h> +#include "libcamera/internal/event_dispatcher.h" #include "libcamera/internal/message.h" #include "libcamera/internal/thread.h" diff --git a/src/libcamera/ipc_unixsocket.cpp b/src/libcamera/ipc_unixsocket.cpp index 5c8cce16..fdb359f7 100644 --- a/src/libcamera/ipc_unixsocket.cpp +++ b/src/libcamera/ipc_unixsocket.cpp @@ -12,8 +12,7 @@ #include <sys/socket.h> #include <unistd.h> -#include <libcamera/event_notifier.h> - +#include "libcamera/internal/event_notifier.h" #include "libcamera/internal/log.h" /** diff --git a/src/libcamera/pipeline/rkisp1/timeline.h b/src/libcamera/pipeline/rkisp1/timeline.h index 0c37b06f..35a08515 100644 --- a/src/libcamera/pipeline/rkisp1/timeline.h +++ b/src/libcamera/pipeline/rkisp1/timeline.h @@ -10,8 +10,7 @@ #include <list> #include <map> -#include <libcamera/timer.h> - +#include "libcamera/internal/timer.h" #include "libcamera/internal/utils.h" namespace libcamera { diff --git a/src/libcamera/process.cpp b/src/libcamera/process.cpp index 72b5afe2..40a434a6 100644 --- a/src/libcamera/process.cpp +++ b/src/libcamera/process.cpp @@ -20,8 +20,7 @@ #include <unistd.h> #include <vector> -#include <libcamera/event_notifier.h> - +#include "libcamera/internal/event_notifier.h" #include "libcamera/internal/log.h" #include "libcamera/internal/utils.h" diff --git a/src/libcamera/proxy/worker/ipa_proxy_linux_worker.cpp b/src/libcamera/proxy/worker/ipa_proxy_linux_worker.cpp index 0c4687f7..bdbac988 100644 --- a/src/libcamera/proxy/worker/ipa_proxy_linux_worker.cpp +++ b/src/libcamera/proxy/worker/ipa_proxy_linux_worker.cpp @@ -9,10 +9,10 @@ #include <sys/types.h> #include <unistd.h> -#include <libcamera/event_dispatcher.h> #include <libcamera/ipa/ipa_interface.h> #include <libcamera/logging.h> +#include "libcamera/internal/event_dispatcher.h" #include "libcamera/internal/ipa_module.h" #include "libcamera/internal/ipc_unixsocket.h" #include "libcamera/internal/log.h" diff --git a/src/libcamera/thread.cpp b/src/libcamera/thread.cpp index b5d7103a..f339dab1 100644 --- a/src/libcamera/thread.cpp +++ b/src/libcamera/thread.cpp @@ -14,8 +14,7 @@ #include <sys/types.h> #include <unistd.h> -#include <libcamera/event_dispatcher.h> - +#include "libcamera/internal/event_dispatcher.h" #include "libcamera/internal/event_dispatcher_poll.h" #include "libcamera/internal/log.h" #include "libcamera/internal/message.h" diff --git a/src/libcamera/timer.cpp b/src/libcamera/timer.cpp index 24e452ed..c242113a 100644 --- a/src/libcamera/timer.cpp +++ b/src/libcamera/timer.cpp @@ -5,13 +5,13 @@ * timer.cpp - Generic timer */ -#include <libcamera/timer.h> +#include "libcamera/internal/timer.h" #include <chrono> #include <libcamera/camera_manager.h> -#include <libcamera/event_dispatcher.h> +#include "libcamera/internal/event_dispatcher.h" #include "libcamera/internal/log.h" #include "libcamera/internal/message.h" #include "libcamera/internal/thread.h" diff --git a/src/libcamera/v4l2_device.cpp b/src/libcamera/v4l2_device.cpp index fd0b140f..decd19ef 100644 --- a/src/libcamera/v4l2_device.cpp +++ b/src/libcamera/v4l2_device.cpp @@ -16,8 +16,7 @@ #include <sys/syscall.h> #include <unistd.h> -#include <libcamera/event_notifier.h> - +#include "libcamera/internal/event_notifier.h" #include "libcamera/internal/log.h" #include "libcamera/internal/sysfs.h" #include "libcamera/internal/utils.h" diff --git a/src/libcamera/v4l2_videodevice.cpp b/src/libcamera/v4l2_videodevice.cpp index 5ee1b479..e76fe2dd 100644 --- a/src/libcamera/v4l2_videodevice.cpp +++ b/src/libcamera/v4l2_videodevice.cpp @@ -20,9 +20,9 @@ #include <linux/version.h> -#include <libcamera/event_notifier.h> #include <libcamera/file_descriptor.h> +#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/test/camera/buffer_import.cpp b/test/camera/buffer_import.cpp index ccf532d7..7ff62826 100644 --- a/test/camera/buffer_import.cpp +++ b/test/camera/buffer_import.cpp @@ -12,12 +12,11 @@ #include <numeric> #include <vector> -#include <libcamera/event_dispatcher.h> -#include <libcamera/timer.h> - #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 fd5292b7..6d564fe4 100644 --- a/test/camera/capture.cpp +++ b/test/camera/capture.cpp @@ -7,11 +7,11 @@ #include <iostream> -#include <libcamera/event_dispatcher.h> #include <libcamera/framebuffer_allocator.h> -#include <libcamera/timer.h> +#include "libcamera/internal/event_dispatcher.h" #include "libcamera/internal/thread.h" +#include "libcamera/internal/timer.h" #include "camera_test.h" #include "test.h" diff --git a/test/event-dispatcher.cpp b/test/event-dispatcher.cpp index 1b617786..8ae05ac6 100644 --- a/test/event-dispatcher.cpp +++ b/test/event-dispatcher.cpp @@ -10,10 +10,9 @@ #include <signal.h> #include <sys/time.h> -#include <libcamera/event_dispatcher.h> -#include <libcamera/timer.h> - +#include "libcamera/internal/event_dispatcher.h" #include "libcamera/internal/thread.h" +#include "libcamera/internal/timer.h" #include "test.h" diff --git a/test/event-thread.cpp b/test/event-thread.cpp index c90e6ac0..aeb8b3bf 100644 --- a/test/event-thread.cpp +++ b/test/event-thread.cpp @@ -10,10 +10,9 @@ #include <string.h> #include <unistd.h> -#include <libcamera/event_notifier.h> -#include <libcamera/timer.h> - +#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 c865092c..1f16c97b 100644 --- a/test/event.cpp +++ b/test/event.cpp @@ -9,11 +9,10 @@ #include <string.h> #include <unistd.h> -#include <libcamera/event_dispatcher.h> -#include <libcamera/event_notifier.h> -#include <libcamera/timer.h> - +#include "libcamera/internal/event_dispatcher.h" +#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 7d551eeb..94cb8593 100644 --- a/test/hotplug-cameras.cpp +++ b/test/hotplug-cameras.cpp @@ -13,11 +13,11 @@ #include <libcamera/camera.h> #include <libcamera/camera_manager.h> -#include <libcamera/event_dispatcher.h> -#include <libcamera/timer.h> +#include "libcamera/internal/event_dispatcher.h" #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 67488409..9f575f93 100644 --- a/test/ipa/ipa_interface_test.cpp +++ b/test/ipa/ipa_interface_test.cpp @@ -12,16 +12,16 @@ #include <sys/types.h> #include <unistd.h> -#include <libcamera/event_dispatcher.h> -#include <libcamera/event_notifier.h> #include <libcamera/ipa/vimc.h> -#include <libcamera/timer.h> #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/thread.h" +#include "libcamera/internal/timer.h" #include "test.h" diff --git a/test/ipc/unixsocket.cpp b/test/ipc/unixsocket.cpp index 9cd07ce8..19a1d7dd 100644 --- a/test/ipc/unixsocket.cpp +++ b/test/ipc/unixsocket.cpp @@ -15,11 +15,10 @@ #include <sys/wait.h> #include <unistd.h> -#include <libcamera/event_dispatcher.h> -#include <libcamera/timer.h> - +#include "libcamera/internal/event_dispatcher.h" #include "libcamera/internal/ipc_unixsocket.h" #include "libcamera/internal/thread.h" +#include "libcamera/internal/timer.h" #include "libcamera/internal/utils.h" #include "test.h" diff --git a/test/log/log_process.cpp b/test/log/log_process.cpp index 2a826222..c0a1a012 100644 --- a/test/log/log_process.cpp +++ b/test/log/log_process.cpp @@ -14,13 +14,13 @@ #include <unistd.h> #include <vector> -#include <libcamera/event_dispatcher.h> #include <libcamera/logging.h> -#include <libcamera/timer.h> +#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 "libcamera/internal/utils.h" #include "test.h" diff --git a/test/object-invoke.cpp b/test/object-invoke.cpp index f3fd2328..a6f816f3 100644 --- a/test/object-invoke.cpp +++ b/test/object-invoke.cpp @@ -8,9 +8,9 @@ #include <iostream> #include <thread> -#include <libcamera/event_dispatcher.h> #include <libcamera/object.h> +#include "libcamera/internal/event_dispatcher.h" #include "libcamera/internal/thread.h" #include "test.h" diff --git a/test/process/process_test.cpp b/test/process/process_test.cpp index a3eaef80..1279d8c1 100644 --- a/test/process/process_test.cpp +++ b/test/process/process_test.cpp @@ -9,11 +9,10 @@ #include <unistd.h> #include <vector> -#include <libcamera/event_dispatcher.h> -#include <libcamera/timer.h> - +#include "libcamera/internal/event_dispatcher.h" #include "libcamera/internal/process.h" #include "libcamera/internal/thread.h" +#include "libcamera/internal/timer.h" #include "libcamera/internal/utils.h" #include "test.h" diff --git a/test/timer-thread.cpp b/test/timer-thread.cpp index f794d8e7..be29eee1 100644 --- a/test/timer-thread.cpp +++ b/test/timer-thread.cpp @@ -8,10 +8,9 @@ #include <chrono> #include <iostream> -#include <libcamera/event_dispatcher.h> -#include <libcamera/timer.h> - +#include "libcamera/internal/event_dispatcher.h" #include "libcamera/internal/thread.h" +#include "libcamera/internal/timer.h" #include "test.h" diff --git a/test/timer.cpp b/test/timer.cpp index 537489d7..fc90b110 100644 --- a/test/timer.cpp +++ b/test/timer.cpp @@ -8,10 +8,9 @@ #include <chrono> #include <iostream> -#include <libcamera/event_dispatcher.h> -#include <libcamera/timer.h> - +#include "libcamera/internal/event_dispatcher.h" #include "libcamera/internal/thread.h" +#include "libcamera/internal/timer.h" #include "test.h" diff --git a/test/v4l2_videodevice/buffer_sharing.cpp b/test/v4l2_videodevice/buffer_sharing.cpp index 5e7e2d97..c75259be 100644 --- a/test/v4l2_videodevice/buffer_sharing.cpp +++ b/test/v4l2_videodevice/buffer_sharing.cpp @@ -13,10 +13,10 @@ #include <iostream> #include <libcamera/buffer.h> -#include <libcamera/event_dispatcher.h> -#include <libcamera/timer.h> +#include "libcamera/internal/event_dispatcher.h" #include "libcamera/internal/thread.h" +#include "libcamera/internal/timer.h" #include "v4l2_videodevice_test.h" diff --git a/test/v4l2_videodevice/capture_async.cpp b/test/v4l2_videodevice/capture_async.cpp index 2b38102e..accdb34a 100644 --- a/test/v4l2_videodevice/capture_async.cpp +++ b/test/v4l2_videodevice/capture_async.cpp @@ -8,10 +8,10 @@ #include <iostream> #include <libcamera/buffer.h> -#include <libcamera/event_dispatcher.h> -#include <libcamera/timer.h> +#include "libcamera/internal/event_dispatcher.h" #include "libcamera/internal/thread.h" +#include "libcamera/internal/timer.h" #include "v4l2_videodevice_test.h" diff --git a/test/v4l2_videodevice/v4l2_m2mdevice.cpp b/test/v4l2_videodevice/v4l2_m2mdevice.cpp index 616261e1..e0f06808 100644 --- a/test/v4l2_videodevice/v4l2_m2mdevice.cpp +++ b/test/v4l2_videodevice/v4l2_m2mdevice.cpp @@ -8,12 +8,12 @@ #include <iostream> #include <libcamera/buffer.h> -#include <libcamera/event_dispatcher.h> -#include <libcamera/timer.h> #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" |