[PATCH/RFC,14/32] libcamera: camera_sensor: Move related classes to subdirectory

19605 diff mbox series

In preparation for adding alternative implementations of the
CameraSensor class, move the code to a subdirectory to avoid cluttering
the main src/libcamera/ directory.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
 src/libcamera/meson.build                               | 3 +--
 src/libcamera/{ => sensor}/camera_sensor.cpp            | 0
 src/libcamera/{ => sensor}/camera_sensor_properties.cpp | 0
 src/libcamera/sensor/meson.build                        | 6 ++++++
 4 files changed, 7 insertions(+), 2 deletions(-)
 rename src/libcamera/{ => sensor}/camera_sensor.cpp (100%)
 rename src/libcamera/{ => sensor}/camera_sensor_properties.cpp (100%)
 create mode 100644 src/libcamera/sensor/meson.build

Hi Laurent

On Fri, Mar 01, 2024 at 11:21:03PM +0200, Laurent Pinchart wrote:
> In preparation for adding alternative implementations of the
> CameraSensor class, move the code to a subdirectory to avoid cluttering
> the main src/libcamera/ directory.
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

I think you can fast-track patches 14 to 18!

Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
> ---
>  src/libcamera/meson.build                               | 3 +--
>  src/libcamera/{ => sensor}/camera_sensor.cpp            | 0
>  src/libcamera/{ => sensor}/camera_sensor_properties.cpp | 0
>  src/libcamera/sensor/meson.build                        | 6 ++++++
>  4 files changed, 7 insertions(+), 2 deletions(-)
>  rename src/libcamera/{ => sensor}/camera_sensor.cpp (100%)
>  rename src/libcamera/{ => sensor}/camera_sensor_properties.cpp (100%)
>  create mode 100644 src/libcamera/sensor/meson.build
>
> diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build
> index 45f63e932e4f..2e7b0c77e63c 100644
> --- a/src/libcamera/meson.build
> +++ b/src/libcamera/meson.build
> @@ -7,8 +7,6 @@ libcamera_sources = files([
>      'camera_controls.cpp',
>      'camera_lens.cpp',
>      'camera_manager.cpp',
> -    'camera_sensor.cpp',
> -    'camera_sensor_properties.cpp',
>      'color_space.cpp',
>      'controls.cpp',
>      'control_serializer.cpp',
> @@ -69,6 +67,7 @@ subdir('converter')
>  subdir('ipa')
>  subdir('pipeline')
>  subdir('proxy')
> +subdir('sensor')
>
>  null_dep = dependency('', required : false)
>
> diff --git a/src/libcamera/camera_sensor.cpp b/src/libcamera/sensor/camera_sensor.cpp
> similarity index 100%
> rename from src/libcamera/camera_sensor.cpp
> rename to src/libcamera/sensor/camera_sensor.cpp
> diff --git a/src/libcamera/camera_sensor_properties.cpp b/src/libcamera/sensor/camera_sensor_properties.cpp
> similarity index 100%
> rename from src/libcamera/camera_sensor_properties.cpp
> rename to src/libcamera/sensor/camera_sensor_properties.cpp
> diff --git a/src/libcamera/sensor/meson.build b/src/libcamera/sensor/meson.build
> new file mode 100644
> index 000000000000..bf4b131a94b1
> --- /dev/null
> +++ b/src/libcamera/sensor/meson.build
> @@ -0,0 +1,6 @@
> +# SPDX-License-Identifier: CC0-1.0
> +
> +libcamera_sources += files([
> +    'camera_sensor.cpp',
> +    'camera_sensor_properties.cpp',
> +])
> --
> Regards,
>
> Laurent Pinchart
>

Hi Laurent,

On Fri, Mar 01, 2024 at 11:21:03PM +0200, Laurent Pinchart wrote:
> In preparation for adding alternative implementations of the
> CameraSensor class, move the code to a subdirectory to avoid cluttering
> the main src/libcamera/ directory.
> 
> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

Reviewed-by: Stefan Klug <stefan.klug@ideasonboard.com>

Cheers,
Stefan

> ---
>  src/libcamera/meson.build                               | 3 +--
>  src/libcamera/{ => sensor}/camera_sensor.cpp            | 0
>  src/libcamera/{ => sensor}/camera_sensor_properties.cpp | 0
>  src/libcamera/sensor/meson.build                        | 6 ++++++
>  4 files changed, 7 insertions(+), 2 deletions(-)
>  rename src/libcamera/{ => sensor}/camera_sensor.cpp (100%)
>  rename src/libcamera/{ => sensor}/camera_sensor_properties.cpp (100%)
>  create mode 100644 src/libcamera/sensor/meson.build
> 
> diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build
> index 45f63e932e4f..2e7b0c77e63c 100644
> --- a/src/libcamera/meson.build
> +++ b/src/libcamera/meson.build
> @@ -7,8 +7,6 @@ libcamera_sources = files([
>      'camera_controls.cpp',
>      'camera_lens.cpp',
>      'camera_manager.cpp',
> -    'camera_sensor.cpp',
> -    'camera_sensor_properties.cpp',
>      'color_space.cpp',
>      'controls.cpp',
>      'control_serializer.cpp',
> @@ -69,6 +67,7 @@ subdir('converter')
>  subdir('ipa')
>  subdir('pipeline')
>  subdir('proxy')
> +subdir('sensor')
>  
>  null_dep = dependency('', required : false)
>  
> diff --git a/src/libcamera/camera_sensor.cpp b/src/libcamera/sensor/camera_sensor.cpp
> similarity index 100%
> rename from src/libcamera/camera_sensor.cpp
> rename to src/libcamera/sensor/camera_sensor.cpp
> diff --git a/src/libcamera/camera_sensor_properties.cpp b/src/libcamera/sensor/camera_sensor_properties.cpp
> similarity index 100%
> rename from src/libcamera/camera_sensor_properties.cpp
> rename to src/libcamera/sensor/camera_sensor_properties.cpp
> diff --git a/src/libcamera/sensor/meson.build b/src/libcamera/sensor/meson.build
> new file mode 100644
> index 000000000000..bf4b131a94b1
> --- /dev/null
> +++ b/src/libcamera/sensor/meson.build
> @@ -0,0 +1,6 @@
> +# SPDX-License-Identifier: CC0-1.0
> +
> +libcamera_sources += files([
> +    'camera_sensor.cpp',
> +    'camera_sensor_properties.cpp',
> +])
> -- 
> Regards,
> 
> Laurent Pinchart
>