diff options
Diffstat (limited to 'src/libcamera/pipeline')
-rw-r--r-- | src/libcamera/pipeline/ipu3/cio2.h | 2 | ||||
-rw-r--r-- | src/libcamera/pipeline/ipu3/frames.h | 2 | ||||
-rw-r--r-- | src/libcamera/pipeline/ipu3/imgu.cpp | 6 | ||||
-rw-r--r-- | src/libcamera/pipeline/ipu3/ipu3.cpp | 6 | ||||
-rw-r--r-- | src/libcamera/pipeline/raspberrypi/dma_heaps.cpp | 2 | ||||
-rw-r--r-- | src/libcamera/pipeline/raspberrypi/rpi_stream.cpp | 4 | ||||
-rw-r--r-- | src/libcamera/pipeline/rkisp1/rkisp1.cpp | 6 | ||||
-rw-r--r-- | src/libcamera/pipeline/rkisp1/rkisp1_path.h | 3 | ||||
-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 | ||||
-rw-r--r-- | src/libcamera/pipeline/uvcvideo/uvcvideo.cpp | 6 | ||||
-rw-r--r-- | src/libcamera/pipeline/vimc/vimc.cpp | 14 |
13 files changed, 34 insertions, 32 deletions
diff --git a/src/libcamera/pipeline/ipu3/cio2.h b/src/libcamera/pipeline/ipu3/cio2.h index d8d4a181..f28e9f1d 100644 --- a/src/libcamera/pipeline/ipu3/cio2.h +++ b/src/libcamera/pipeline/ipu3/cio2.h @@ -11,7 +11,7 @@ #include <queue> #include <vector> -#include <libcamera/signal.h> +#include <libcamera/base/signal.h> #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 59e64e81..3ef7e445 100644 --- a/src/libcamera/pipeline/ipu3/frames.h +++ b/src/libcamera/pipeline/ipu3/frames.h @@ -12,7 +12,7 @@ #include <queue> #include <vector> -#include <libcamera/signal.h> +#include <libcamera/base/signal.h> namespace libcamera { diff --git a/src/libcamera/pipeline/ipu3/imgu.cpp b/src/libcamera/pipeline/ipu3/imgu.cpp index 32d143a8..e955bc34 100644 --- a/src/libcamera/pipeline/ipu3/imgu.cpp +++ b/src/libcamera/pipeline/ipu3/imgu.cpp @@ -13,12 +13,12 @@ #include <linux/media-bus-format.h> +#include <libcamera/base/log.h> +#include <libcamera/base/utils.h> + #include <libcamera/formats.h> #include <libcamera/stream.h> -#include <libcamera/base/utils.h> - -#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 6b43ad2f..76c3bb3d 100644 --- a/src/libcamera/pipeline/ipu3/ipu3.cpp +++ b/src/libcamera/pipeline/ipu3/ipu3.cpp @@ -11,6 +11,9 @@ #include <queue> #include <vector> +#include <libcamera/base/log.h> +#include <libcamera/base/utils.h> + #include <libcamera/camera.h> #include <libcamera/control_ids.h> #include <libcamera/formats.h> @@ -20,13 +23,10 @@ #include <libcamera/request.h> #include <libcamera/stream.h> -#include <libcamera/base/utils.h> - #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 4d5dd6cb..573ea11d 100644 --- a/src/libcamera/pipeline/raspberrypi/dma_heaps.cpp +++ b/src/libcamera/pipeline/raspberrypi/dma_heaps.cpp @@ -14,7 +14,7 @@ #include <sys/ioctl.h> #include <unistd.h> -#include "libcamera/internal/log.h" +#include <libcamera/base/log.h> /* * /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 f2430415..b3265d0e 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 <libcamera/ipa/raspberrypi_ipa_interface.h> +#include <libcamera/base/log.h> -#include "libcamera/internal/log.h" +#include <libcamera/ipa/raspberrypi_ipa_interface.h> namespace libcamera { diff --git a/src/libcamera/pipeline/rkisp1/rkisp1.cpp b/src/libcamera/pipeline/rkisp1/rkisp1.cpp index c625d724..00df4f0b 100644 --- a/src/libcamera/pipeline/rkisp1/rkisp1.cpp +++ b/src/libcamera/pipeline/rkisp1/rkisp1.cpp @@ -14,6 +14,9 @@ #include <linux/media-bus-format.h> +#include <libcamera/base/log.h> +#include <libcamera/base/utils.h> + #include <libcamera/buffer.h> #include <libcamera/camera.h> #include <libcamera/control_ids.h> @@ -24,13 +27,10 @@ #include <libcamera/request.h> #include <libcamera/stream.h> -#include <libcamera/base/utils.h> - #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 3b3e37d2..c185ac39 100644 --- a/src/libcamera/pipeline/rkisp1/rkisp1_path.h +++ b/src/libcamera/pipeline/rkisp1/rkisp1_path.h @@ -10,10 +10,11 @@ #include <memory> #include <vector> +#include <libcamera/base/signal.h> + #include <libcamera/camera.h> #include <libcamera/geometry.h> #include <libcamera/pixel_format.h> -#include <libcamera/signal.h> #include <libcamera/span.h> #include "libcamera/internal/media_object.h" 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" diff --git a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp index d8c17dcc..0f634b8d 100644 --- a/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp +++ b/src/libcamera/pipeline/uvcvideo/uvcvideo.cpp @@ -12,6 +12,9 @@ #include <memory> #include <tuple> +#include <libcamera/base/log.h> +#include <libcamera/base/utils.h> + #include <libcamera/camera.h> #include <libcamera/control_ids.h> #include <libcamera/controls.h> @@ -19,10 +22,7 @@ #include <libcamera/request.h> #include <libcamera/stream.h> -#include <libcamera/base/utils.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/sysfs.h" diff --git a/src/libcamera/pipeline/vimc/vimc.cpp b/src/libcamera/pipeline/vimc/vimc.cpp index 025ca562..12f7517f 100644 --- a/src/libcamera/pipeline/vimc/vimc.cpp +++ b/src/libcamera/pipeline/vimc/vimc.cpp @@ -14,29 +14,29 @@ #include <linux/media-bus-format.h> #include <linux/version.h> +#include <libcamera/base/log.h> +#include <libcamera/base/utils.h> + #include <libcamera/camera.h> #include <libcamera/control_ids.h> #include <libcamera/controls.h> #include <libcamera/formats.h> -#include <libcamera/ipa/ipa_interface.h> -#include <libcamera/ipa/ipa_module_info.h> #include <libcamera/request.h> #include <libcamera/stream.h> -#include <libcamera/base/utils.h> +#include <libcamera/ipa/ipa_interface.h> +#include <libcamera/ipa/ipa_module_info.h> +#include <libcamera/ipa/vimc_ipa_interface.h> +#include <libcamera/ipa/vimc_ipa_proxy.h> #include "libcamera/internal/camera_sensor.h" #include "libcamera/internal/device_enumerator.h" #include "libcamera/internal/ipa_manager.h" -#include "libcamera/internal/log.h" #include "libcamera/internal/media_device.h" #include "libcamera/internal/pipeline_handler.h" #include "libcamera/internal/v4l2_subdevice.h" #include "libcamera/internal/v4l2_videodevice.h" -#include <libcamera/ipa/vimc_ipa_interface.h> -#include <libcamera/ipa/vimc_ipa_proxy.h> - namespace libcamera { LOG_DEFINE_CATEGORY(VIMC) |