Skip to content

Commit dd0a754

Browse files
naushirpinchartl
authored andcommitted
pipeline: raspberrypi: Switch to RPi::DelayedControls
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 <[email protected]> Reviewed-by: David Plowman <[email protected]> Signed-off-by: Laurent Pinchart <[email protected]>
1 parent 962f6cd commit dd0a754

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/libcamera/pipeline/raspberrypi/raspberrypi.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@
3333
#include "libcamera/internal/bayer_format.h"
3434
#include "libcamera/internal/camera.h"
3535
#include "libcamera/internal/camera_sensor.h"
36-
#include "libcamera/internal/delayed_controls.h"
3736
#include "libcamera/internal/device_enumerator.h"
3837
#include "libcamera/internal/framebuffer.h"
3938
#include "libcamera/internal/ipa_manager.h"
4039
#include "libcamera/internal/media_device.h"
4140
#include "libcamera/internal/pipeline_handler.h"
4241
#include "libcamera/internal/v4l2_videodevice.h"
4342

43+
#include "delayed_controls.h"
4444
#include "dma_heaps.h"
4545
#include "rpi_stream.h"
4646

@@ -243,7 +243,7 @@ class RPiCameraData : public Camera::Private
243243
RPi::DmaHeap dmaHeap_;
244244
SharedFD lsTable_;
245245

246-
std::unique_ptr<DelayedControls> delayedCtrls_;
246+
std::unique_ptr<RPi::DelayedControls> delayedCtrls_;
247247
bool sensorMetadata_;
248248

249249
/*
@@ -1302,13 +1302,13 @@ int PipelineHandlerRPi::registerCamera(MediaDevice *unicam, MediaDevice *isp, Me
13021302
* Setup our delayed control writer with the sensor default
13031303
* gain and exposure delays. Mark VBLANK for priority write.
13041304
*/
1305-
std::unordered_map<uint32_t, DelayedControls::ControlParams> params = {
1305+
std::unordered_map<uint32_t, RPi::DelayedControls::ControlParams> params = {
13061306
{ V4L2_CID_ANALOGUE_GAIN, { result.sensorConfig.gainDelay, false } },
13071307
{ V4L2_CID_EXPOSURE, { result.sensorConfig.exposureDelay, false } },
13081308
{ V4L2_CID_HBLANK, { result.sensorConfig.hblankDelay, false } },
13091309
{ V4L2_CID_VBLANK, { result.sensorConfig.vblankDelay, true } }
13101310
};
1311-
data->delayedCtrls_ = std::make_unique<DelayedControls>(data->sensor_->device(), params);
1311+
data->delayedCtrls_ = std::make_unique<RPi::DelayedControls>(data->sensor_->device(), params);
13121312
data->sensorMetadata_ = result.sensorConfig.sensorMetadata;
13131313

13141314
/* Register initial controls that the Raspberry Pi IPA can handle. */

0 commit comments

Comments
 (0)