|
33 | 33 | #include "libcamera/internal/bayer_format.h"
|
34 | 34 | #include "libcamera/internal/camera.h"
|
35 | 35 | #include "libcamera/internal/camera_sensor.h"
|
36 |
| -#include "libcamera/internal/delayed_controls.h" |
37 | 36 | #include "libcamera/internal/device_enumerator.h"
|
38 | 37 | #include "libcamera/internal/framebuffer.h"
|
39 | 38 | #include "libcamera/internal/ipa_manager.h"
|
40 | 39 | #include "libcamera/internal/media_device.h"
|
41 | 40 | #include "libcamera/internal/pipeline_handler.h"
|
42 | 41 | #include "libcamera/internal/v4l2_videodevice.h"
|
43 | 42 |
|
| 43 | +#include "delayed_controls.h" |
44 | 44 | #include "dma_heaps.h"
|
45 | 45 | #include "rpi_stream.h"
|
46 | 46 |
|
@@ -243,7 +243,7 @@ class RPiCameraData : public Camera::Private
|
243 | 243 | RPi::DmaHeap dmaHeap_;
|
244 | 244 | SharedFD lsTable_;
|
245 | 245 |
|
246 |
| - std::unique_ptr<DelayedControls> delayedCtrls_; |
| 246 | + std::unique_ptr<RPi::DelayedControls> delayedCtrls_; |
247 | 247 | bool sensorMetadata_;
|
248 | 248 |
|
249 | 249 | /*
|
@@ -1302,13 +1302,13 @@ int PipelineHandlerRPi::registerCamera(MediaDevice *unicam, MediaDevice *isp, Me
|
1302 | 1302 | * Setup our delayed control writer with the sensor default
|
1303 | 1303 | * gain and exposure delays. Mark VBLANK for priority write.
|
1304 | 1304 | */
|
1305 |
| - std::unordered_map<uint32_t, DelayedControls::ControlParams> params = { |
| 1305 | + std::unordered_map<uint32_t, RPi::DelayedControls::ControlParams> params = { |
1306 | 1306 | { V4L2_CID_ANALOGUE_GAIN, { result.sensorConfig.gainDelay, false } },
|
1307 | 1307 | { V4L2_CID_EXPOSURE, { result.sensorConfig.exposureDelay, false } },
|
1308 | 1308 | { V4L2_CID_HBLANK, { result.sensorConfig.hblankDelay, false } },
|
1309 | 1309 | { V4L2_CID_VBLANK, { result.sensorConfig.vblankDelay, true } }
|
1310 | 1310 | };
|
1311 |
| - data->delayedCtrls_ = std::make_unique<DelayedControls>(data->sensor_->device(), params); |
| 1311 | + data->delayedCtrls_ = std::make_unique<RPi::DelayedControls>(data->sensor_->device(), params); |
1312 | 1312 | data->sensorMetadata_ = result.sensorConfig.sensorMetadata;
|
1313 | 1313 |
|
1314 | 1314 | /* Register initial controls that the Raspberry Pi IPA can handle. */
|
|
0 commit comments