[libcamera-devel] [PATCH v6 2/8] pipeline: raspberrypi: Switch to RPi::DelayedControls

[David Plowman]

Hi Naush

Thanks for the patch.

On Tue, 15 Nov 2022 at 09:08, Naushir Patuck via libcamera-devel
<libcamera-devel at lists.libcamera.org> wrote:
>
> Switch the Raspberry Pi pipeline handler to use the DelayedControls
> implementation in the RPi:: namespace. This will allow us to use Raspberry Pi
> specific API changes in future commits.
>
> Signed-off-by: Naushir Patuck <naush at raspberrypi.com>

Reviewed-by: David Plowman <david.plowman at raspberrypi.com>

Thanks!
David

> ---
>  src/libcamera/pipeline/raspberrypi/raspberrypi.cpp | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
> index 343f8cb2c7ed..f3be4ee3b730 100644
> --- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
> +++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
> @@ -33,7 +33,6 @@
>  #include "libcamera/internal/bayer_format.h"
>  #include "libcamera/internal/camera.h"
>  #include "libcamera/internal/camera_sensor.h"
> -#include "libcamera/internal/delayed_controls.h"
>  #include "libcamera/internal/device_enumerator.h"
>  #include "libcamera/internal/framebuffer.h"
>  #include "libcamera/internal/ipa_manager.h"
> @@ -41,6 +40,7 @@
>  #include "libcamera/internal/pipeline_handler.h"
>  #include "libcamera/internal/v4l2_videodevice.h"
>
> +#include "delayed_controls.h"
>  #include "dma_heaps.h"
>  #include "rpi_stream.h"
>
> @@ -243,7 +243,7 @@ public:
>         RPi::DmaHeap dmaHeap_;
>         SharedFD lsTable_;
>
> -       std::unique_ptr<DelayedControls> delayedCtrls_;
> +       std::unique_ptr<RPi::DelayedControls> delayedCtrls_;
>         bool sensorMetadata_;
>
>         /*
> @@ -1294,13 +1294,13 @@ int PipelineHandlerRPi::registerCamera(MediaDevice *unicam, MediaDevice *isp, Me
>          * Setup our delayed control writer with the sensor default
>          * gain and exposure delays. Mark VBLANK for priority write.
>          */
> -       std::unordered_map<uint32_t, DelayedControls::ControlParams> params = {
> +       std::unordered_map<uint32_t, RPi::DelayedControls::ControlParams> params = {
>                 { V4L2_CID_ANALOGUE_GAIN, { result.sensorConfig.gainDelay, false } },
>                 { V4L2_CID_EXPOSURE, { result.sensorConfig.exposureDelay, false } },
>                 { V4L2_CID_HBLANK, { result.sensorConfig.hblankDelay, false } },
>                 { V4L2_CID_VBLANK, { result.sensorConfig.vblankDelay, true } }
>         };
> -       data->delayedCtrls_ = std::make_unique<DelayedControls>(data->sensor_->device(), params);
> +       data->delayedCtrls_ = std::make_unique<RPi::DelayedControls>(data->sensor_->device(), params);
>         data->sensorMetadata_ = result.sensorConfig.sensorMetadata;
>
>         /* Register initial controls that the Raspberry Pi IPA can handle. */
> --
> 2.25.1
>