libcamera/base: Move span to base library

Move span, and adjust the Doxygen exclusion as well.

Reviewed-by: Paul Elder <paul.elder@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>

22 files changed, 27 insertions, 30 deletions

diff --git a/Documentation/Doxyfile.in b/Documentation/Doxyfile.in
index 8305f56a..a79d3770 100644
--- a/Documentation/Doxyfile.in
+++ b/Documentation/Doxyfile.in
@@ -834,7 +834,7 @@ RECURSIVE              = YES
 # Note that relative paths are relative to the directory from which doxygen is
 # run.
 
-EXCLUDE                = @TOP_SRCDIR@/include/libcamera/span.h \
+EXCLUDE                = @TOP_SRCDIR@/include/libcamera/base/span.h \
 			 @TOP_SRCDIR@/include/libcamera/internal/device_enumerator_sysfs.h \
 			 @TOP_SRCDIR@/include/libcamera/internal/device_enumerator_udev.h \
 			 @TOP_SRCDIR@/include/libcamera/internal/ipc_pipe_unixsocket.h \
diff --git a/include/libcamera/base/file.h b/include/libcamera/base/file.h
index 5cd98579..465f3ef8 100644
--- a/include/libcamera/base/file.h
+++ b/include/libcamera/base/file.h
@@ -13,8 +13,7 @@
 #include <string>
 
 #include <libcamera/base/class.h>
-
-#include <libcamera/span.h>
+#include <libcamera/base/span.h>
 
 namespace libcamera {
 
diff --git a/include/libcamera/base/meson.build b/include/libcamera/base/meson.build
index 83c664af..6b90f9f7 100644
--- a/include/libcamera/base/meson.build
+++ b/include/libcamera/base/meson.build
@@ -14,6 +14,7 @@ libcamera_base_headers = files([
     'object.h',
     'semaphore.h',
     'signal.h',
+    'span.h',
     'thread.h',
     'timer.h',
     'utils.h',
diff --git a/include/libcamera/span.h b/include/libcamera/base/span.h
index 7a35806b..21099d56 100644
--- a/include/libcamera/span.h
+++ b/include/libcamera/base/span.h
@@ -5,8 +5,8 @@
  * span.h - C++20 std::span<> implementation for C++11
  */
 
-#ifndef __LIBCAMERA_SPAN_H__
-#define __LIBCAMERA_SPAN_H__
+#ifndef __LIBCAMERA_BASE_SPAN_H__
+#define __LIBCAMERA_BASE_SPAN_H__
 
 #include <array>
 #include <iterator>
@@ -421,4 +421,4 @@ private:
 
 } /* namespace libcamera */
 
-#endif /* __LIBCAMERA_SPAN_H__ */
+#endif /* __LIBCAMERA_BASE_SPAN_H__ */
diff --git a/include/libcamera/controls.h b/include/libcamera/controls.h
index f62b6cf0..1bc958a4 100644
--- a/include/libcamera/controls.h
+++ b/include/libcamera/controls.h
@@ -15,9 +15,9 @@
 #include <vector>
 
 #include <libcamera/base/class.h>
+#include <libcamera/base/span.h>
 
 #include <libcamera/geometry.h>
-#include <libcamera/span.h>
 
 namespace libcamera {
 
diff --git a/include/libcamera/internal/buffer.h b/include/libcamera/internal/buffer.h
index 91dd2496..beae0cb9 100644
--- a/include/libcamera/internal/buffer.h
+++ b/include/libcamera/internal/buffer.h
@@ -11,9 +11,9 @@
 #include <vector>
 
 #include <libcamera/base/class.h>
+#include <libcamera/base/span.h>
 
 #include <libcamera/buffer.h>
-#include <libcamera/span.h>
 
 namespace libcamera {
 
diff --git a/include/libcamera/internal/byte_stream_buffer.h b/include/libcamera/internal/byte_stream_buffer.h
index 7eefb1a7..d0f0df5e 100644
--- a/include/libcamera/internal/byte_stream_buffer.h
+++ b/include/libcamera/internal/byte_stream_buffer.h
@@ -12,8 +12,7 @@
 #include <type_traits>
 
 #include <libcamera/base/class.h>
-
-#include <libcamera/span.h>
+#include <libcamera/base/span.h>
 
 namespace libcamera {
 
diff --git a/include/libcamera/internal/pub_key.h b/include/libcamera/internal/pub_key.h
index f5f988b5..9261c9c2 100644
--- a/include/libcamera/internal/pub_key.h
+++ b/include/libcamera/internal/pub_key.h
@@ -9,7 +9,7 @@
 
 #include <stdint.h>
 
-#include <libcamera/span.h>
+#include <libcamera/base/span.h>
 
 #if HAVE_GNUTLS
 struct gnutls_pubkey_st;
diff --git a/include/libcamera/internal/v4l2_device.h b/include/libcamera/internal/v4l2_device.h
index 1edd664a..77b835b3 100644
--- a/include/libcamera/internal/v4l2_device.h
+++ b/include/libcamera/internal/v4l2_device.h
@@ -15,9 +15,9 @@
 
 #include <libcamera/base/log.h>
 #include <libcamera/base/signal.h>
+#include <libcamera/base/span.h>
 
 #include <libcamera/controls.h>
-#include <libcamera/span.h>
 
 namespace libcamera {
 
diff --git a/include/libcamera/meson.build b/include/libcamera/meson.build
index c69d63d2..e4d5c655 100644
--- a/include/libcamera/meson.build
+++ b/include/libcamera/meson.build
@@ -12,7 +12,6 @@ libcamera_public_headers = files([
     'logging.h',
     'pixel_format.h',
     'request.h',
-    'span.h',
     'stream.h',
     'transform.h',
 ])
diff --git a/src/android/camera_buffer.h b/src/android/camera_buffer.h
index e850c4e3..2617ff6b 100644
--- a/src/android/camera_buffer.h
+++ b/src/android/camera_buffer.h
@@ -10,8 +10,7 @@
 #include <hardware/camera3.h>
 
 #include <libcamera/base/class.h>
-
-#include <libcamera/span.h>
+#include <libcamera/base/span.h>
 
 class CameraBuffer final : public libcamera::Extensible
 {
diff --git a/src/android/jpeg/encoder.h b/src/android/jpeg/encoder.h
index 8d449369..28e7f92a 100644
--- a/src/android/jpeg/encoder.h
+++ b/src/android/jpeg/encoder.h
@@ -7,8 +7,9 @@
 #ifndef __ANDROID_JPEG_ENCODER_H__
 #define __ANDROID_JPEG_ENCODER_H__
 
+#include <libcamera/base/span.h>
+
 #include <libcamera/buffer.h>
-#include <libcamera/span.h>
 #include <libcamera/stream.h>
 
 class Encoder
diff --git a/src/android/jpeg/exif.h b/src/android/jpeg/exif.h
index 8aa1b123..23b0e097 100644
--- a/src/android/jpeg/exif.h
+++ b/src/android/jpeg/exif.h
@@ -13,8 +13,9 @@
 
 #include <libexif/exif-data.h>
 
+#include <libcamera/base/span.h>
+
 #include <libcamera/geometry.h>
-#include <libcamera/span.h>
 
 class Exif
 {
diff --git a/src/ipa/libipa/histogram.h b/src/ipa/libipa/histogram.h
index e06f1884..c2761cb2 100644
--- a/src/ipa/libipa/histogram.h
+++ b/src/ipa/libipa/histogram.h
@@ -13,7 +13,7 @@
 
 #include <vector>
 
-#include <libcamera/span.h>
+#include <libcamera/base/span.h>
 
 namespace libcamera {
 
diff --git a/src/ipa/raspberrypi/cam_helper.hpp b/src/ipa/raspberrypi/cam_helper.hpp
index a6664819..b19c95f6 100644
--- a/src/ipa/raspberrypi/cam_helper.hpp
+++ b/src/ipa/raspberrypi/cam_helper.hpp
@@ -8,8 +8,7 @@
 
 #include <string>
 
-#include <libcamera/span.h>
-
+#include <libcamera/base/span.h>
 #include <libcamera/base/utils.h>
 
 #include "camera_mode.h"
diff --git a/src/ipa/raspberrypi/md_parser.hpp b/src/ipa/raspberrypi/md_parser.hpp
index 65aab02d..8497216f 100644
--- a/src/ipa/raspberrypi/md_parser.hpp
+++ b/src/ipa/raspberrypi/md_parser.hpp
@@ -8,7 +8,7 @@
 
 #include <stdint.h>
 
-#include <libcamera/span.h>
+#include <libcamera/base/span.h>
 
 /*
  * Camera metadata parser class. Usage as shown below.
diff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp
index a3f01449..4d09a84f 100644
--- a/src/ipa/raspberrypi/raspberrypi.cpp
+++ b/src/ipa/raspberrypi/raspberrypi.cpp
@@ -16,6 +16,7 @@
 #include <linux/bcm2835-isp.h>
 
 #include <libcamera/base/log.h>
+#include <libcamera/base/span.h>
 
 #include <libcamera/buffer.h>
 #include <libcamera/control_ids.h>
@@ -26,7 +27,6 @@
 #include <libcamera/ipa/raspberrypi.h>
 #include <libcamera/ipa/raspberrypi_ipa_interface.h>
 #include <libcamera/request.h>
-#include <libcamera/span.h>
 
 #include "libcamera/internal/buffer.h"
 
diff --git a/src/libcamera/control_serializer.cpp b/src/libcamera/control_serializer.cpp
index dd5a2608..30046628 100644
--- a/src/libcamera/control_serializer.cpp
+++ b/src/libcamera/control_serializer.cpp
@@ -12,11 +12,11 @@
 #include <vector>
 
 #include <libcamera/base/log.h>
+#include <libcamera/base/span.h>
 
 #include <libcamera/control_ids.h>
 #include <libcamera/controls.h>
 #include <libcamera/ipa/ipa_controls.h>
-#include <libcamera/span.h>
 
 #include "libcamera/internal/byte_stream_buffer.h"
 
diff --git a/src/libcamera/ipa_module.cpp b/src/libcamera/ipa_module.cpp
index 984c1fed..adfb8d40 100644
--- a/src/libcamera/ipa_module.cpp
+++ b/src/libcamera/ipa_module.cpp
@@ -21,10 +21,9 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <libcamera/span.h>
-
 #include <libcamera/base/file.h>
 #include <libcamera/base/log.h>
+#include <libcamera/base/span.h>
 #include <libcamera/base/utils.h>
 
 #include "libcamera/internal/pipeline_handler.h"
diff --git a/src/libcamera/pipeline/rkisp1/rkisp1_path.h b/src/libcamera/pipeline/rkisp1/rkisp1_path.h
index c185ac39..91757600 100644
--- a/src/libcamera/pipeline/rkisp1/rkisp1_path.h
+++ b/src/libcamera/pipeline/rkisp1/rkisp1_path.h
@@ -11,11 +11,11 @@
 #include <vector>
 
 #include <libcamera/base/signal.h>
+#include <libcamera/base/span.h>
 
 #include <libcamera/camera.h>
 #include <libcamera/geometry.h>
 #include <libcamera/pixel_format.h>
-#include <libcamera/span.h>
 
 #include "libcamera/internal/media_object.h"
 #include "libcamera/internal/v4l2_videodevice.h"
diff --git a/test/span.cpp b/test/span.cpp
index ca037c8f..abf3a5d6 100644
--- a/test/span.cpp
+++ b/test/span.cpp
@@ -9,7 +9,7 @@
  * Include first to ensure the header is self-contained, as there's no span.cpp
  * in libcamera.
  */
-#include <libcamera/span.h>
+#include <libcamera/base/span.h>
 
 #include <array>
 #include <iostream>
diff --git a/test/utils.cpp b/test/utils.cpp
index 9cd2cd07..d7f810e9 100644
--- a/test/utils.cpp
+++ b/test/utils.cpp
@@ -11,11 +11,11 @@
 #include <string>
 #include <vector>
 
-#include <libcamera/geometry.h>
-#include <libcamera/span.h>
-
+#include <libcamera/base/span.h>
 #include <libcamera/base/utils.h>
 
+#include <libcamera/geometry.h>
+
 #include "test.h"
 
 using namespace std;