libcamera/base: Move class helpers to the base library

Move the class support infrastructure to the base library.

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

include/libcamera/base/class.h

@@ -4,8 +4,8 @@
  *
  * class.h - Utilities and helpers for classes
  */
-#ifndef __LIBCAMERA_CLASS_H__
-#define __LIBCAMERA_CLASS_H__
+#ifndef __LIBCAMERA_BASE_CLASS_H__
+#define __LIBCAMERA_BASE_CLASS_H__
 
 #include <memory>
 
@@ -102,4 +102,4 @@ private:
 
 } /* namespace libcamera */
 
-#endif /* __LIBCAMERA_CLASS_H__ */
+#endif /* __LIBCAMERA_BASE_CLASS_H__ */

include/libcamera/base/meson.build

@@ -3,6 +3,7 @@
 libcamera_base_include_dir = libcamera_include_dir / 'base'
 
 libcamera_base_headers = files([
+    'class.h',
     'utils.h',
 ])
 

include/libcamera/buffer.h

@@ -10,7 +10,8 @@
 #include <stdint.h>
 #include <vector>
 
-#include <libcamera/class.h>
+#include <libcamera/base/class.h>
+
 #include <libcamera/file_descriptor.h>
 
 namespace libcamera {

include/libcamera/camera.h

@@ -12,7 +12,8 @@
 #include <stdint.h>
 #include <string>
 
-#include <libcamera/class.h>
+#include <libcamera/base/class.h>
+
 #include <libcamera/controls.h>
 #include <libcamera/object.h>
 #include <libcamera/request.h>

include/libcamera/camera_manager.h

@@ -12,7 +12,8 @@
 #include <sys/types.h>
 #include <vector>
 
-#include <libcamera/class.h>
+#include <libcamera/base/class.h>
+
 #include <libcamera/object.h>
 #include <libcamera/signal.h>
 

include/libcamera/controls.h

@@ -14,7 +14,8 @@
 #include <unordered_map>
 #include <vector>
 
-#include <libcamera/class.h>
+#include <libcamera/base/class.h>
+
 #include <libcamera/geometry.h>
 #include <libcamera/span.h>
 

include/libcamera/framebuffer_allocator.h

@@ -11,7 +11,7 @@
 #include <memory>
 #include <vector>
 
-#include <libcamera/class.h>
+#include <libcamera/base/class.h>
 
 namespace libcamera {
 

include/libcamera/internal/buffer.h

@@ -10,7 +10,8 @@
 #include <sys/mman.h>
 #include <vector>
 
-#include <libcamera/class.h>
+#include <libcamera/base/class.h>
+
 #include <libcamera/buffer.h>
 #include <libcamera/span.h>
 

include/libcamera/internal/byte_stream_buffer.h

@@ -11,7 +11,8 @@
 #include <stdint.h>
 #include <type_traits>
 
-#include <libcamera/class.h>
+#include <libcamera/base/class.h>
+
 #include <libcamera/span.h>
 
 namespace libcamera {

include/libcamera/internal/camera_sensor.h

@@ -11,7 +11,8 @@
 #include <string>
 #include <vector>
 
-#include <libcamera/class.h>
+#include <libcamera/base/class.h>
+
 #include <libcamera/controls.h>
 #include <libcamera/geometry.h>
 #include <libcamera/ipa/core_ipa_interface.h>

include/libcamera/internal/file.h

@@ -11,7 +11,8 @@
 #include <string>
 #include <sys/types.h>
 
-#include <libcamera/class.h>
+#include <libcamera/base/class.h>
+
 #include <libcamera/span.h>
 
 namespace libcamera {

include/libcamera/internal/log.h

@@ -10,8 +10,7 @@
 #include <chrono>
 #include <sstream>
 
-#include <libcamera/class.h>
-
+#include <libcamera/base/class.h>
 #include <libcamera/base/utils.h>
 
 namespace libcamera {

include/libcamera/internal/media_object.h

@@ -12,7 +12,7 @@
 
 #include <linux/media.h>
 
-#include <libcamera/class.h>
+#include <libcamera/base/class.h>
 
 namespace libcamera {
 

include/libcamera/internal/pipeline_handler.h

@@ -15,7 +15,8 @@
 #include <sys/types.h>
 #include <vector>
 
-#include <libcamera/class.h>
+#include <libcamera/base/class.h>
+
 #include <libcamera/controls.h>
 #include <libcamera/object.h>
 #include <libcamera/stream.h>

include/libcamera/internal/v4l2_subdevice.h

@@ -11,7 +11,8 @@
 #include <string>
 #include <vector>
 
-#include <libcamera/class.h>
+#include <libcamera/base/class.h>
+
 #include <libcamera/geometry.h>
 
 #include "libcamera/internal/formats.h"

include/libcamera/internal/v4l2_videodevice.h

@@ -16,8 +16,9 @@
 
 #include <linux/videodev2.h>
 
+#include <libcamera/base/class.h>
+
 #include <libcamera/buffer.h>
-#include <libcamera/class.h>
 #include <libcamera/geometry.h>
 #include <libcamera/pixel_format.h>
 #include <libcamera/signal.h>

include/libcamera/meson.build

@@ -5,7 +5,6 @@ libcamera_public_headers = files([
     'buffer.h',
     'camera.h',
     'camera_manager.h',
-    'class.h',
     'compiler.h',
     'controls.h',
     'file_descriptor.h',

include/libcamera/request.h

@@ -13,7 +13,8 @@
 #include <string>
 #include <unordered_set>
 
-#include <libcamera/class.h>
+#include <libcamera/base/class.h>
+
 #include <libcamera/controls.h>
 #include <libcamera/signal.h>
 

src/android/camera_buffer.h

@@ -9,7 +9,8 @@
 
 #include <hardware/camera3.h>
 
-#include <libcamera/class.h>
+#include <libcamera/base/class.h>
+
 #include <libcamera/span.h>
 
 class CameraBuffer final : public libcamera::Extensible

src/android/camera_capabilities.h

@@ -11,8 +11,9 @@
 #include <memory>
 #include <vector>
 
+#include <libcamera/base/class.h>
+
 #include <libcamera/camera.h>
-#include <libcamera/class.h>
 #include <libcamera/formats.h>
 #include <libcamera/geometry.h>
 

src/android/camera_hal_config.h

@@ -10,7 +10,7 @@
 #include <map>
 #include <string>
 
-#include <libcamera/class.h>
+#include <libcamera/base/class.h>
 
 struct CameraConfigData {
 	int facing = -1;

src/libcamera/base/class.cpp

@@ -5,7 +5,7 @@
  * class.cpp - Utilities and helpers for classes
  */
 
-#include <libcamera/class.h>
+#include <libcamera/base/class.h>
 
 /**
  * \file class.h

src/libcamera/base/meson.build

@@ -1,6 +1,7 @@
 # SPDX-License-Identifier: CC0-1.0
 
 libcamera_base_sources = files([
+    'class.cpp',
     'utils.cpp',
 ])
 

src/libcamera/meson.build

@@ -10,7 +10,6 @@ libcamera_sources = files([
     'camera_manager.cpp',
     'camera_sensor.cpp',
     'camera_sensor_properties.cpp',
-    'class.cpp',
     'controls.cpp',
     'control_serializer.cpp',
     'control_validator.cpp',