diff options
| author | David Plowman <david.plowman@raspberrypi.com> | 2021-03-08 22:39:39 +0000 |
|---|---|---|
| committer | Laurent Pinchart <laurent.pinchart@ideasonboard.com> | 2021-03-09 00:55:18 +0200 |
| commit | 3a59555414da0f1c8a24bdede1ae279154a2f058 (patch) | |
| tree | 33c1f632fb82881b9f8c4a2a5c78923ebc1788dc | |
| parent | 8f3a54ae6a53076ebba44b13dbe237e348bd6d27 (diff) | |
ipa: raspberrypi: Rename vblank field in SensorConfig to vblankDelay
The name vblankDelay is clearer.
Signed-off-by: David Plowman <david.plowman@raspberrypi.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
| -rw-r--r-- | include/libcamera/ipa/raspberrypi.mojom | 2 | ||||
| -rw-r--r-- | src/ipa/raspberrypi/raspberrypi.cpp | 2 | ||||
| -rw-r--r-- | src/libcamera/pipeline/raspberrypi/raspberrypi.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/include/libcamera/ipa/raspberrypi.mojom b/include/libcamera/ipa/raspberrypi.mojom index f733a2cd..c3d614b8 100644 --- a/include/libcamera/ipa/raspberrypi.mojom +++ b/include/libcamera/ipa/raspberrypi.mojom @@ -22,7 +22,7 @@ enum ConfigOutputParameters { struct SensorConfig { uint32 gainDelay; uint32 exposureDelay; - uint32 vblank; + uint32 vblankDelay; uint32 sensorMetadata; }; diff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp index 741bff4c..85a2b846 100644 --- a/src/ipa/raspberrypi/raspberrypi.cpp +++ b/src/ipa/raspberrypi/raspberrypi.cpp @@ -349,7 +349,7 @@ void IPARPi::configure(const CameraSensorInfo &sensorInfo, result->params |= ipa::RPi::ConfigSensorParams; result->sensorConfig.gainDelay = gainDelay; result->sensorConfig.exposureDelay = exposureDelay; - result->sensorConfig.vblank = vblankDelay; + result->sensorConfig.vblankDelay = vblankDelay; result->sensorConfig.sensorMetadata = sensorMetadata; } diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp index db91f1b5..6387fae5 100644 --- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp +++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp @@ -1266,7 +1266,7 @@ int RPiCameraData::configureIPA(const CameraConfiguration *config) std::unordered_map<uint32_t, unsigned int> delays = { { V4L2_CID_ANALOGUE_GAIN, result.sensorConfig.gainDelay }, { V4L2_CID_EXPOSURE, result.sensorConfig.exposureDelay }, - { V4L2_CID_VBLANK, result.sensorConfig.vblank } + { V4L2_CID_VBLANK, result.sensorConfig.vblankDelay } }; delayedCtrls_ = std::make_unique<DelayedControls>(unicam_[Unicam::Image].dev(), delays); |