libcamera/base: Move extended base functionality
Move the functionality for the following components to the new base support library: - BoundMethod - EventDispatcher - EventDispatcherPoll - Log - Message - Object - Signal - Semaphore - Thread - Timer While it would be preferable to see these split to move one component per commit, these components are all interdependent upon each other, which leaves us with one big change performing the move for all of them. Reviewed-by: Hirokazu Honda <hiroh@chromium.org> Reviewed-by: Paul Elder <paul.elder@ideasonboard.com> Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
This commit is contained in:
@@ -12,11 +12,12 @@
|
||||
#include <numeric>
|
||||
#include <vector>
|
||||
|
||||
#include <libcamera/base/event_dispatcher.h>
|
||||
#include <libcamera/base/thread.h>
|
||||
#include <libcamera/base/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"
|
||||
|
||||
@@ -9,9 +9,9 @@
|
||||
|
||||
#include <libcamera/framebuffer_allocator.h>
|
||||
|
||||
#include "libcamera/internal/event_dispatcher.h"
|
||||
#include "libcamera/internal/thread.h"
|
||||
#include "libcamera/internal/timer.h"
|
||||
#include <libcamera/base/event_dispatcher.h>
|
||||
#include <libcamera/base/thread.h>
|
||||
#include <libcamera/base/timer.h>
|
||||
|
||||
#include "camera_test.h"
|
||||
#include "test.h"
|
||||
|
||||
@@ -10,9 +10,9 @@
|
||||
#include <signal.h>
|
||||
#include <sys/time.h>
|
||||
|
||||
#include "libcamera/internal/event_dispatcher.h"
|
||||
#include "libcamera/internal/thread.h"
|
||||
#include "libcamera/internal/timer.h"
|
||||
#include <libcamera/base/event_dispatcher.h>
|
||||
#include <libcamera/base/thread.h>
|
||||
#include <libcamera/base/timer.h>
|
||||
|
||||
#include "test.h"
|
||||
|
||||
|
||||
@@ -10,9 +10,10 @@
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include <libcamera/base/thread.h>
|
||||
#include <libcamera/base/timer.h>
|
||||
|
||||
#include "libcamera/internal/event_notifier.h"
|
||||
#include "libcamera/internal/thread.h"
|
||||
#include "libcamera/internal/timer.h"
|
||||
|
||||
#include "test.h"
|
||||
|
||||
|
||||
+4
-3
@@ -9,10 +9,11 @@
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include "libcamera/internal/event_dispatcher.h"
|
||||
#include <libcamera/base/event_dispatcher.h>
|
||||
#include <libcamera/base/thread.h>
|
||||
#include <libcamera/base/timer.h>
|
||||
|
||||
#include "libcamera/internal/event_notifier.h"
|
||||
#include "libcamera/internal/thread.h"
|
||||
#include "libcamera/internal/timer.h"
|
||||
|
||||
#include "test.h"
|
||||
|
||||
|
||||
@@ -14,10 +14,11 @@
|
||||
#include <libcamera/camera.h>
|
||||
#include <libcamera/camera_manager.h>
|
||||
|
||||
#include "libcamera/internal/event_dispatcher.h"
|
||||
#include <libcamera/base/event_dispatcher.h>
|
||||
#include <libcamera/base/thread.h>
|
||||
#include <libcamera/base/timer.h>
|
||||
|
||||
#include "libcamera/internal/file.h"
|
||||
#include "libcamera/internal/thread.h"
|
||||
#include "libcamera/internal/timer.h"
|
||||
|
||||
#include "test.h"
|
||||
|
||||
|
||||
@@ -14,15 +14,16 @@
|
||||
|
||||
#include <libcamera/ipa/vimc_ipa_proxy.h>
|
||||
|
||||
#include <libcamera/base/event_dispatcher.h>
|
||||
#include <libcamera/base/thread.h>
|
||||
#include <libcamera/base/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/process.h"
|
||||
#include "libcamera/internal/thread.h"
|
||||
#include "libcamera/internal/timer.h"
|
||||
|
||||
#include "test.h"
|
||||
|
||||
|
||||
@@ -16,10 +16,11 @@
|
||||
#include <sys/wait.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include "libcamera/internal/event_dispatcher.h"
|
||||
#include <libcamera/base/event_dispatcher.h>
|
||||
#include <libcamera/base/thread.h>
|
||||
#include <libcamera/base/timer.h>
|
||||
|
||||
#include "libcamera/internal/ipc_unixsocket.h"
|
||||
#include "libcamera/internal/thread.h"
|
||||
#include "libcamera/internal/timer.h"
|
||||
|
||||
#include "test.h"
|
||||
|
||||
|
||||
@@ -15,19 +15,18 @@
|
||||
#include <sys/wait.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include <libcamera/base/event_dispatcher.h>
|
||||
#include <libcamera/base/thread.h>
|
||||
#include <libcamera/base/timer.h>
|
||||
#include <libcamera/base/utils.h>
|
||||
|
||||
#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;
|
||||
|
||||
|
||||
@@ -16,9 +16,9 @@
|
||||
#include <sys/types.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#include <libcamera/logging.h>
|
||||
#include <libcamera/base/log.h>
|
||||
|
||||
#include "libcamera/internal/log.h"
|
||||
#include <libcamera/logging.h>
|
||||
|
||||
#include "test.h"
|
||||
|
||||
|
||||
@@ -16,13 +16,13 @@
|
||||
|
||||
#include <libcamera/logging.h>
|
||||
|
||||
#include <libcamera/base/event_dispatcher.h>
|
||||
#include <libcamera/base/log.h>
|
||||
#include <libcamera/base/thread.h>
|
||||
#include <libcamera/base/timer.h>
|
||||
#include <libcamera/base/utils.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 "test.h"
|
||||
|
||||
|
||||
+2
-2
@@ -9,8 +9,8 @@
|
||||
#include <iostream>
|
||||
#include <thread>
|
||||
|
||||
#include "libcamera/internal/message.h"
|
||||
#include "libcamera/internal/thread.h"
|
||||
#include <libcamera/base/message.h>
|
||||
#include <libcamera/base/thread.h>
|
||||
|
||||
#include "test.h"
|
||||
|
||||
|
||||
@@ -7,9 +7,8 @@
|
||||
|
||||
#include <iostream>
|
||||
|
||||
#include <libcamera/object.h>
|
||||
|
||||
#include "libcamera/internal/thread.h"
|
||||
#include <libcamera/base/object.h>
|
||||
#include <libcamera/base/thread.h>
|
||||
|
||||
#include "test.h"
|
||||
|
||||
|
||||
@@ -8,10 +8,9 @@
|
||||
#include <iostream>
|
||||
#include <thread>
|
||||
|
||||
#include <libcamera/object.h>
|
||||
|
||||
#include "libcamera/internal/event_dispatcher.h"
|
||||
#include "libcamera/internal/thread.h"
|
||||
#include <libcamera/base/event_dispatcher.h>
|
||||
#include <libcamera/base/object.h>
|
||||
#include <libcamera/base/thread.h>
|
||||
|
||||
#include "test.h"
|
||||
|
||||
|
||||
+3
-4
@@ -7,10 +7,9 @@
|
||||
|
||||
#include <iostream>
|
||||
|
||||
#include <libcamera/object.h>
|
||||
|
||||
#include "libcamera/internal/message.h"
|
||||
#include "libcamera/internal/thread.h"
|
||||
#include <libcamera/base/message.h>
|
||||
#include <libcamera/base/object.h>
|
||||
#include <libcamera/base/thread.h>
|
||||
|
||||
#include "test.h"
|
||||
|
||||
|
||||
@@ -9,12 +9,13 @@
|
||||
#include <unistd.h>
|
||||
#include <vector>
|
||||
|
||||
|
||||
#include <libcamera/base/event_dispatcher.h>
|
||||
#include <libcamera/base/thread.h>
|
||||
#include <libcamera/base/timer.h>
|
||||
#include <libcamera/base/utils.h>
|
||||
|
||||
#include "libcamera/internal/event_dispatcher.h"
|
||||
#include "libcamera/internal/process.h"
|
||||
#include "libcamera/internal/thread.h"
|
||||
#include "libcamera/internal/timer.h"
|
||||
|
||||
#include "test.h"
|
||||
|
||||
|
||||
@@ -17,13 +17,14 @@
|
||||
#include <unistd.h>
|
||||
#include <vector>
|
||||
|
||||
#include <libcamera/base/thread.h>
|
||||
#include <libcamera/base/timer.h>
|
||||
|
||||
#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"
|
||||
|
||||
@@ -9,11 +9,10 @@
|
||||
#include <iostream>
|
||||
#include <thread>
|
||||
|
||||
#include <libcamera/base/message.h>
|
||||
#include <libcamera/base/thread.h>
|
||||
#include <libcamera/base/utils.h>
|
||||
|
||||
#include "libcamera/internal/message.h"
|
||||
#include "libcamera/internal/thread.h"
|
||||
|
||||
#include "test.h"
|
||||
|
||||
using namespace std;
|
||||
|
||||
+2
-2
@@ -8,8 +8,8 @@
|
||||
#include <iostream>
|
||||
#include <string.h>
|
||||
|
||||
#include <libcamera/object.h>
|
||||
#include <libcamera/signal.h>
|
||||
#include <libcamera/base/object.h>
|
||||
#include <libcamera/base/signal.h>
|
||||
|
||||
#include "test.h"
|
||||
|
||||
|
||||
+1
-1
@@ -10,7 +10,7 @@
|
||||
#include <memory>
|
||||
#include <thread>
|
||||
|
||||
#include "libcamera/internal/thread.h"
|
||||
#include <libcamera/base/thread.h>
|
||||
|
||||
#include "test.h"
|
||||
|
||||
|
||||
@@ -8,9 +8,9 @@
|
||||
#include <chrono>
|
||||
#include <iostream>
|
||||
|
||||
#include "libcamera/internal/event_dispatcher.h"
|
||||
#include "libcamera/internal/thread.h"
|
||||
#include "libcamera/internal/timer.h"
|
||||
#include <libcamera/base/event_dispatcher.h>
|
||||
#include <libcamera/base/thread.h>
|
||||
#include <libcamera/base/timer.h>
|
||||
|
||||
#include "test.h"
|
||||
|
||||
|
||||
+3
-3
@@ -8,9 +8,9 @@
|
||||
#include <chrono>
|
||||
#include <iostream>
|
||||
|
||||
#include "libcamera/internal/event_dispatcher.h"
|
||||
#include "libcamera/internal/thread.h"
|
||||
#include "libcamera/internal/timer.h"
|
||||
#include <libcamera/base/event_dispatcher.h>
|
||||
#include <libcamera/base/thread.h>
|
||||
#include <libcamera/base/timer.h>
|
||||
|
||||
#include "test.h"
|
||||
|
||||
|
||||
@@ -14,9 +14,9 @@
|
||||
|
||||
#include <libcamera/buffer.h>
|
||||
|
||||
#include "libcamera/internal/event_dispatcher.h"
|
||||
#include "libcamera/internal/thread.h"
|
||||
#include "libcamera/internal/timer.h"
|
||||
#include <libcamera/base/event_dispatcher.h>
|
||||
#include <libcamera/base/thread.h>
|
||||
#include <libcamera/base/timer.h>
|
||||
|
||||
#include "v4l2_videodevice_test.h"
|
||||
|
||||
|
||||
@@ -9,9 +9,9 @@
|
||||
|
||||
#include <libcamera/buffer.h>
|
||||
|
||||
#include "libcamera/internal/event_dispatcher.h"
|
||||
#include "libcamera/internal/thread.h"
|
||||
#include "libcamera/internal/timer.h"
|
||||
#include <libcamera/base/event_dispatcher.h>
|
||||
#include <libcamera/base/thread.h>
|
||||
#include <libcamera/base/timer.h>
|
||||
|
||||
#include "v4l2_videodevice_test.h"
|
||||
|
||||
|
||||
@@ -9,11 +9,12 @@
|
||||
|
||||
#include <libcamera/buffer.h>
|
||||
|
||||
#include <libcamera/base/event_dispatcher.h>
|
||||
#include <libcamera/base/thread.h>
|
||||
#include <libcamera/base/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"
|
||||
|
||||
Reference in New Issue
Block a user