diff options
| author | Kieran Bingham <kieran.bingham@ideasonboard.com> | 2021-06-15 16:15:12 +0100 |
|---|---|---|
| committer | Kieran Bingham <kieran.bingham@ideasonboard.com> | 2021-06-25 16:11:08 +0100 |
| commit | 27aff949fbc1b9aabfc594bbfd6f94be55a086ec (patch) | |
| tree | 9ddbc2462a685a6db3ed33f09ed7a493376439d6 /src/libcamera/pipeline/simple | |
| parent | 6410d1d37c1ea9d1d168840a7ba063facb0bc9d6 (diff) | |
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>
Diffstat (limited to 'src/libcamera/pipeline/simple')
| -rw-r--r-- | src/libcamera/pipeline/simple/converter.cpp | 8 | ||||
| -rw-r--r-- | src/libcamera/pipeline/simple/converter.h | 4 | ||||
| -rw-r--r-- | src/libcamera/pipeline/simple/simple.cpp | 3 |
3 files changed, 8 insertions, 7 deletions
diff --git a/src/libcamera/pipeline/simple/converter.cpp b/src/libcamera/pipeline/simple/converter.cpp index 589f185b..9af1096b 100644 --- a/src/libcamera/pipeline/simple/converter.cpp +++ b/src/libcamera/pipeline/simple/converter.cpp @@ -10,14 +10,14 @@ #include <algorithm> #include <limits.h> +#include <libcamera/base/log.h> +#include <libcamera/base/signal.h> +#include <libcamera/base/utils.h> + #include <libcamera/buffer.h> #include <libcamera/geometry.h> -#include <libcamera/signal.h> #include <libcamera/stream.h> -#include <libcamera/base/utils.h> - -#include "libcamera/internal/log.h" #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 480e528d..276a2a29 100644 --- a/src/libcamera/pipeline/simple/converter.h +++ b/src/libcamera/pipeline/simple/converter.h @@ -16,9 +16,9 @@ #include <vector> #include <libcamera/pixel_format.h> -#include <libcamera/signal.h> -#include "libcamera/internal/log.h" +#include <libcamera/base/log.h> +#include <libcamera/base/signal.h> namespace libcamera { diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp index 1894014d..4d78e6fa 100644 --- a/src/libcamera/pipeline/simple/simple.cpp +++ b/src/libcamera/pipeline/simple/simple.cpp @@ -21,6 +21,8 @@ #include <linux/media-bus-format.h> +#include <libcamera/base/log.h> + #include <libcamera/camera.h> #include <libcamera/control_ids.h> #include <libcamera/request.h> @@ -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" |