From dd667e38646928f25c7614bd41b168667f223722 Mon Sep 17 00:00:00 2001
From: Naushir Patuck <naush@raspberrypi.com>
Date: Thu, 6 Oct 2022 14:17:42 +0100
Subject: ipa: raspberrypi: Add line length to DeviceStatus
Add a lineLength field to the DeviceStatus structure to store the line
length used for a particular frame.
Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
Tested-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
src/ipa/raspberrypi/controller/device_status.cpp | 1 +
src/ipa/raspberrypi/controller/device_status.h | 4 +++-
src/ipa/raspberrypi/raspberrypi.cpp | 2 ++
3 files changed, 6 insertions(+), 1 deletion(-)
(limited to 'src')
diff --git a/src/ipa/raspberrypi/controller/device_status.cpp b/src/ipa/raspberrypi/controller/device_status.cpp
index 2360a77b..c907efdd 100644
--- a/src/ipa/raspberrypi/controller/device_status.cpp
+++ b/src/ipa/raspberrypi/controller/device_status.cpp
@@ -12,6 +12,7 @@ std::ostream &operator<<(std::ostream &out, const DeviceStatus &d)
{
out << "Exposure: " << d.shutterSpeed
<< " Frame length: " << d.frameLength
+ << " Line length: " << d.lineLength
<< " Gain: " << d.analogueGain;
if (d.aperture)
diff --git a/src/ipa/raspberrypi/controller/device_status.h b/src/ipa/raspberrypi/controller/device_status.h
index 8f74e21b..4384c214 100644
--- a/src/ipa/raspberrypi/controller/device_status.h
+++ b/src/ipa/raspberrypi/controller/device_status.h
@@ -19,7 +19,7 @@
struct DeviceStatus {
DeviceStatus()
: shutterSpeed(std::chrono::seconds(0)), frameLength(0),
- analogueGain(0.0)
+ lineLength(std::chrono::seconds(0)), analogueGain(0.0)
{
}
@@ -29,6 +29,8 @@ struct DeviceStatus {
libcamera::utils::Duration shutterSpeed;
/* frame length given in number of lines */
uint32_t frameLength;
+ /* line length for the current frame */
+ libcamera::utils::Duration lineLength;
double analogueGain;
/* 1.0/distance-in-metres, or 0 if unknown */
std::optional<double> lensPosition;
diff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp
index a916db1f..5976db05 100644
--- a/src/ipa/raspberrypi/raspberrypi.cpp
+++ b/src/ipa/raspberrypi/raspberrypi.cpp
@@ -1107,7 +1107,9 @@ void IPARPi::fillDeviceStatus(const ControlList &sensorControls)
int32_t exposureLines = sensorControls.get(V4L2_CID_EXPOSURE).get<int32_t>();
int32_t gainCode = sensorControls.get(V4L2_CID_ANALOGUE_GAIN).get<int32_t>();
int32_t vblank = sensorControls.get(V4L2_CID_VBLANK).get<int32_t>();
+ int32_t hblank = sensorControls.get(V4L2_CID_HBLANK).get<int32_t>();
+ deviceStatus.lineLength = helper_->hblankToLineLength(hblank);
deviceStatus.shutterSpeed = helper_->exposure(exposureLines, mode_.minLineLength);
deviceStatus.analogueGain = helper_->gain(gainCode);
deviceStatus.frameLength = mode_.height + vblank;
--
cgit v1.2.1