[libcamera-devel] [PATCH v2 5/5] apply explicit fixed-sized Span type casts
Christian Rauch
Rauch.Christian at gmx.de
Tue Apr 5 02:42:15 CEST 2022
The change of types of some Controls from variable- to fixed-sized requires
explicit casting of FrameDurationLimits, ColourGains and SensorBlackLevels.
Signed-off-by: Christian Rauch <Rauch.Christian at gmx.de>
---
src/ipa/raspberrypi/raspberrypi.cpp | 18 +++++++++---------
.../pipeline/raspberrypi/raspberrypi.cpp | 2 +-
src/qcam/dng_writer.cpp | 2 +-
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp
index 926b3185..c27c897f 100644
--- a/src/ipa/raspberrypi/raspberrypi.cpp
+++ b/src/ipa/raspberrypi/raspberrypi.cpp
@@ -499,18 +499,18 @@ void IPARPi::reportMetadata()
AwbStatus *awbStatus = rpiMetadata_.GetLocked<AwbStatus>("awb.status");
if (awbStatus) {
- libcameraMetadata_.set(controls::ColourGains, { static_cast<float>(awbStatus->gain_r),
- static_cast<float>(awbStatus->gain_b) });
+ libcameraMetadata_.set(controls::ColourGains, Span<const float, 2>({ static_cast<float>(awbStatus->gain_r),
+ static_cast<float>(awbStatus->gain_b) }));
libcameraMetadata_.set(controls::ColourTemperature, awbStatus->temperature_K);
}
BlackLevelStatus *blackLevelStatus = rpiMetadata_.GetLocked<BlackLevelStatus>("black_level.status");
if (blackLevelStatus)
libcameraMetadata_.set(controls::SensorBlackLevels,
- { static_cast<int32_t>(blackLevelStatus->black_level_r),
- static_cast<int32_t>(blackLevelStatus->black_level_g),
- static_cast<int32_t>(blackLevelStatus->black_level_g),
- static_cast<int32_t>(blackLevelStatus->black_level_b) });
+ Span<const int32_t, 4>({ static_cast<int32_t>(blackLevelStatus->black_level_r),
+ static_cast<int32_t>(blackLevelStatus->black_level_g),
+ static_cast<int32_t>(blackLevelStatus->black_level_g),
+ static_cast<int32_t>(blackLevelStatus->black_level_b) }));
FocusStatus *focusStatus = rpiMetadata_.GetLocked<FocusStatus>("focus.status");
if (focusStatus && focusStatus->num == 12) {
@@ -815,7 +815,7 @@ void IPARPi::queueRequest(const ControlList &controls)
if (gains[0] != 0.0f && gains[1] != 0.0f)
/* A gain of 0.0f will switch back to auto mode. */
libcameraMetadata_.set(controls::ColourGains,
- { gains[0], gains[1] });
+ Span<const float, 2>({ gains[0], gains[1] }));
break;
}
@@ -1099,8 +1099,8 @@ void IPARPi::applyFrameDurations(Duration minFrameDuration, Duration maxFrameDur
/* Return the validated limits via metadata. */
libcameraMetadata_.set(controls::FrameDurationLimits,
- { static_cast<int64_t>(minFrameDuration_.get<std::micro>()),
- static_cast<int64_t>(maxFrameDuration_.get<std::micro>()) });
+ Span<const int64_t, 2>({ static_cast<int64_t>(minFrameDuration_.get<std::micro>()),
+ static_cast<int64_t>(maxFrameDuration_.get<std::micro>()) }));
/*
* Calculate the maximum exposure time possible for the AGC to use.
diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
index 34d9f4c4..7d4142cf 100644
--- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
+++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp
@@ -1692,7 +1692,7 @@ void RPiCameraData::statsMetadataComplete(uint32_t bufferId, const ControlList &
* V4L2_CID_NOTIFY_GAINS control (which means notifyGainsUnity_ is set).
*/
if (notifyGainsUnity_ && controls.contains(libcamera::controls::ColourGains)) {
- libcamera::Span<const float> colourGains = controls.get(libcamera::controls::ColourGains);
+ libcamera::Span<const float, 2> colourGains = controls.get(libcamera::controls::ColourGains);
/* The control wants linear gains in the order B, Gb, Gr, R. */
ControlList ctrls(sensor_->controls());
std::array<int32_t, 4> gains{
diff --git a/src/qcam/dng_writer.cpp b/src/qcam/dng_writer.cpp
index a7dd30f8..d712dab2 100644
--- a/src/qcam/dng_writer.cpp
+++ b/src/qcam/dng_writer.cpp
@@ -437,7 +437,7 @@ int DNGWriter::write(const char *filename, const Camera *camera,
const double eps = 1e-2;
if (metadata.contains(controls::ColourGains)) {
- Span<const float> const &colourGains = metadata.get(controls::ColourGains);
+ Span<const float, 2> const &colourGains = metadata.get(controls::ColourGains);
if (colourGains[0] > eps && colourGains[1] > eps) {
wbGain = Matrix3d::diag(colourGains[0], 1, colourGains[1]);
neutral[0] = 1.0 / colourGains[0]; /* red */
--
2.25.1
More information about the libcamera-devel
mailing list