<div dir="ltr">Hi,<div><br></div><div>Ping for a review on this series please.</div><div><br></div><div>Thanks,</div><div>Naush</div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Fri, 10 Jun 2022 at 13:25, Naushir Patuck <<a href="mailto:naush@raspberrypi.com">naush@raspberrypi.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Currently the pipeline handler advertises controls handled by the IPA from a<br>
static ControlInfoMap defined in the raspberrypi.h header. This change removes<br>
this header file, and instead the IPA returns the ControlInfoMap to the pipeline<br>
handler from the ipa::init() function. This is done to allow the IPA to adjust<br>
the limits of the controls based on the sensor mode in a subsequent change.<br>
<br>
Signed-off-by: Naushir Patuck <<a href="mailto:naush@raspberrypi.com" target="_blank">naush@raspberrypi.com</a>><br>
---<br>
include/libcamera/ipa/raspberrypi.h | 55 -------------------<br>
include/libcamera/ipa/raspberrypi.mojom | 7 ++-<br>
src/ipa/raspberrypi/raspberrypi.cpp | 39 ++++++++++---<br>
.../pipeline/raspberrypi/raspberrypi.cpp | 30 +++++-----<br>
.../pipeline/raspberrypi/rpi_stream.h | 1 -<br>
5 files changed, 53 insertions(+), 79 deletions(-)<br>
delete mode 100644 include/libcamera/ipa/raspberrypi.h<br>
<br>
diff --git a/include/libcamera/ipa/raspberrypi.h b/include/libcamera/ipa/raspberrypi.h<br>
deleted file mode 100644<br>
index 6a56b0083b85..000000000000<br>
--- a/include/libcamera/ipa/raspberrypi.h<br>
+++ /dev/null<br>
@@ -1,55 +0,0 @@<br>
-/* SPDX-License-Identifier: LGPL-2.1-or-later */<br>
-/*<br>
- * Copyright (C) 2019-2020, Raspberry Pi Ltd.<br>
- *<br>
- * raspberrypi.h - Image Processing Algorithm interface for Raspberry Pi<br>
- */<br>
-<br>
-#pragma once<br>
-<br>
-#include <stdint.h><br>
-<br>
-#include <libcamera/control_ids.h><br>
-#include <libcamera/controls.h><br>
-<br>
-#ifndef __DOXYGEN__<br>
-<br>
-namespace libcamera {<br>
-<br>
-namespace RPi {<br>
-<br>
-/*<br>
- * List of controls handled by the Raspberry Pi IPA<br>
- *<br>
- * \todo This list will need to be built dynamically from the control<br>
- * algorithms loaded by the json file, once this is supported. At that<br>
- * point applications should check first whether a control is supported,<br>
- * and the pipeline handler may be reverted so that it aborts when an<br>
- * unsupported control is encountered.<br>
- */<br>
-static const ControlInfoMap Controls({<br>
- { &controls::AeEnable, ControlInfo(false, true) },<br>
- { &controls::ExposureTime, ControlInfo(0, 999999) },<br>
- { &controls::AnalogueGain, ControlInfo(1.0f, 32.0f) },<br>
- { &controls::AeMeteringMode, ControlInfo(controls::AeMeteringModeValues) },<br>
- { &controls::AeConstraintMode, ControlInfo(controls::AeConstraintModeValues) },<br>
- { &controls::AeExposureMode, ControlInfo(controls::AeExposureModeValues) },<br>
- { &controls::ExposureValue, ControlInfo(-8.0f, 8.0f, 0.0f) },<br>
- { &controls::AwbEnable, ControlInfo(false, true) },<br>
- { &controls::ColourGains, ControlInfo(0.0f, 32.0f) },<br>
- { &controls::AwbMode, ControlInfo(controls::AwbModeValues) },<br>
- { &controls::Brightness, ControlInfo(-1.0f, 1.0f, 0.0f) },<br>
- { &controls::Contrast, ControlInfo(0.0f, 32.0f, 1.0f) },<br>
- { &controls::Saturation, ControlInfo(0.0f, 32.0f, 1.0f) },<br>
- { &controls::Sharpness, ControlInfo(0.0f, 16.0f, 1.0f) },<br>
- { &controls::ColourCorrectionMatrix, ControlInfo(-16.0f, 16.0f) },<br>
- { &controls::ScalerCrop, ControlInfo(Rectangle{}, Rectangle(65535, 65535, 65535, 65535), Rectangle{}) },<br>
- { &controls::FrameDurationLimits, ControlInfo(INT64_C(1000), INT64_C(1000000000)) },<br>
- { &controls::draft::NoiseReductionMode, ControlInfo(controls::draft::NoiseReductionModeValues) }<br>
- }, controls::controls);<br>
-<br>
-} /* namespace RPi */<br>
-<br>
-} /* namespace libcamera */<br>
-<br>
-#endif /* __DOXYGEN__ */<br>
diff --git a/include/libcamera/ipa/raspberrypi.mojom b/include/libcamera/ipa/raspberrypi.mojom<br>
index a60c3bb43d3c..77f52c282b0f 100644<br>
--- a/include/libcamera/ipa/raspberrypi.mojom<br>
+++ b/include/libcamera/ipa/raspberrypi.mojom<br>
@@ -26,6 +26,11 @@ struct SensorConfig {<br>
uint32 sensorMetadata;<br>
};<br>
<br>
+struct IPAInitResult {<br>
+ SensorConfig sensorConfig;<br>
+ libcamera.ControlInfoMap controlInfo;<br>
+};<br>
+<br>
struct ISPConfig {<br>
uint32 embeddedBufferId;<br>
uint32 bayerBufferId;<br>
@@ -50,7 +55,7 @@ struct StartConfig {<br>
<br>
interface IPARPiInterface {<br>
init(libcamera.IPASettings settings)<br>
- => (int32 ret, SensorConfig sensorConfig);<br>
+ => (int32 ret, IPAInitResult result);<br>
start(libcamera.ControlList controls) => (StartConfig startConfig);<br>
stop();<br>
<br>
diff --git a/src/ipa/raspberrypi/raspberrypi.cpp b/src/ipa/raspberrypi/raspberrypi.cpp<br>
index 3b126bb5175e..089528f5e126 100644<br>
--- a/src/ipa/raspberrypi/raspberrypi.cpp<br>
+++ b/src/ipa/raspberrypi/raspberrypi.cpp<br>
@@ -24,7 +24,6 @@<br>
#include <libcamera/framebuffer.h><br>
#include <libcamera/ipa/ipa_interface.h><br>
#include <libcamera/ipa/ipa_module_info.h><br>
-#include <libcamera/ipa/raspberrypi.h><br>
#include <libcamera/ipa/raspberrypi_ipa_interface.h><br>
#include <libcamera/request.h><br>
<br>
@@ -72,6 +71,28 @@ constexpr Duration defaultMaxFrameDuration = 250.0s;<br>
*/<br>
constexpr Duration controllerMinFrameDuration = 1.0s / 30.0;<br>
<br>
+/* List of controls handled by the Raspberry Pi IPA */<br>
+static const ControlInfoMap::Map ipaControls{<br>
+ { &controls::AeEnable, ControlInfo(false, true) },<br>
+ { &controls::ExposureTime, ControlInfo(0, 999999) },<br>
+ { &controls::AnalogueGain, ControlInfo(1.0f, 32.0f) },<br>
+ { &controls::AeMeteringMode, ControlInfo(controls::AeMeteringModeValues) },<br>
+ { &controls::AeConstraintMode, ControlInfo(controls::AeConstraintModeValues) },<br>
+ { &controls::AeExposureMode, ControlInfo(controls::AeExposureModeValues) },<br>
+ { &controls::ExposureValue, ControlInfo(-8.0f, 8.0f, 0.0f) },<br>
+ { &controls::AwbEnable, ControlInfo(false, true) },<br>
+ { &controls::ColourGains, ControlInfo(0.0f, 32.0f) },<br>
+ { &controls::AwbMode, ControlInfo(controls::AwbModeValues) },<br>
+ { &controls::Brightness, ControlInfo(-1.0f, 1.0f, 0.0f) },<br>
+ { &controls::Contrast, ControlInfo(0.0f, 32.0f, 1.0f) },<br>
+ { &controls::Saturation, ControlInfo(0.0f, 32.0f, 1.0f) },<br>
+ { &controls::Sharpness, ControlInfo(0.0f, 16.0f, 1.0f) },<br>
+ { &controls::ColourCorrectionMatrix, ControlInfo(-16.0f, 16.0f) },<br>
+ { &controls::ScalerCrop, ControlInfo(Rectangle{}, Rectangle(65535, 65535, 65535, 65535), Rectangle{}) },<br>
+ { &controls::FrameDurationLimits, ControlInfo(INT64_C(1000), INT64_C(1000000000)) },<br>
+ { &controls::draft::NoiseReductionMode, ControlInfo(controls::draft::NoiseReductionModeValues) }<br>
+};<br>
+<br>
LOG_DEFINE_CATEGORY(IPARPI)<br>
<br>
namespace ipa::RPi {<br>
@@ -91,7 +112,7 @@ public:<br>
munmap(lsTable_, MaxLsGridSize);<br>
}<br>
<br>
- int init(const IPASettings &settings, SensorConfig *sensorConfig) override;<br>
+ int init(const IPASettings &settings, IPAInitResult *result) override;<br>
void start(const ControlList &controls, StartConfig *startConfig) override;<br>
void stop() override {}<br>
<br>
@@ -180,7 +201,7 @@ private:<br>
uint32_t maxSensorGainCode_;<br>
};<br>
<br>
-int IPARPi::init(const IPASettings &settings, SensorConfig *sensorConfig)<br>
+int IPARPi::init(const IPASettings &settings, IPAInitResult *result)<br>
{<br>
/*<br>
* Load the "helper" for this sensor. This tells us all the device specific stuff<br>
@@ -202,15 +223,19 @@ int IPARPi::init(const IPASettings &settings, SensorConfig *sensorConfig)<br>
helper_->GetDelays(exposureDelay, gainDelay, vblankDelay);<br>
sensorMetadata = helper_->SensorEmbeddedDataPresent();<br>
<br>
- sensorConfig->gainDelay = gainDelay;<br>
- sensorConfig->exposureDelay = exposureDelay;<br>
- sensorConfig->vblankDelay = vblankDelay;<br>
- sensorConfig->sensorMetadata = sensorMetadata;<br>
+ result->sensorConfig.gainDelay = gainDelay;<br>
+ result->sensorConfig.exposureDelay = exposureDelay;<br>
+ result->sensorConfig.vblankDelay = vblankDelay;<br>
+ result->sensorConfig.sensorMetadata = sensorMetadata;<br>
<br>
/* Load the tuning file for this sensor. */<br>
controller_.Read(settings.configurationFile.c_str());<br>
controller_.Initialise();<br>
<br>
+ /* Return the controls handled by the IPA */<br>
+ ControlInfoMap::Map ctrlMap = ipaControls;<br>
+ result->controlInfo = ControlInfoMap(std::move(ctrlMap), controls::controls);<br>
+<br>
return 0;<br>
}<br>
<br>
diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp<br>
index adc397e8aabd..d980c1a71dd8 100644<br>
--- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp<br>
+++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp<br>
@@ -20,7 +20,6 @@<br>
#include <libcamera/camera.h><br>
#include <libcamera/control_ids.h><br>
#include <libcamera/formats.h><br>
-#include <libcamera/ipa/raspberrypi.h><br>
#include <libcamera/ipa/raspberrypi_ipa_interface.h><br>
#include <libcamera/ipa/raspberrypi_ipa_proxy.h><br>
#include <libcamera/logging.h><br>
@@ -199,7 +198,7 @@ public:<br>
void freeBuffers();<br>
void frameStarted(uint32_t sequence);<br>
<br>
- int loadIPA(ipa::RPi::SensorConfig *sensorConfig);<br>
+ int loadIPA(ipa::RPi::IPAInitResult *result);<br>
int configureIPA(const CameraConfiguration *config, ipa::RPi::IPAConfigResult *result);<br>
<br>
void enumerateVideoDevices(MediaLink *link);<br>
@@ -1231,15 +1230,15 @@ int PipelineHandlerRPi::registerCamera(MediaDevice *unicam, MediaDevice *isp, Me<br>
<br>
data->sensorFormats_ = populateSensorFormats(data->sensor_);<br>
<br>
- ipa::RPi::SensorConfig sensorConfig;<br>
- if (data->loadIPA(&sensorConfig)) {<br>
+ ipa::RPi::IPAInitResult result;<br>
+ if (data->loadIPA(&result)) {<br>
LOG(RPI, Error) << "Failed to load a suitable IPA library";<br>
return -EINVAL;<br>
}<br>
<br>
- if (sensorConfig.sensorMetadata ^ !!unicamEmbedded) {<br>
+ if (result.sensorConfig.sensorMetadata ^ !!unicamEmbedded) {<br>
LOG(RPI, Warning) << "Mismatch between Unicam and CamHelper for embedded data usage!";<br>
- sensorConfig.sensorMetadata = false;<br>
+ result.sensorConfig.sensorMetadata = false;<br>
if (unicamEmbedded)<br>
data->unicam_[Unicam::Embedded].dev()->bufferReady.disconnect();<br>
}<br>
@@ -1253,7 +1252,7 @@ int PipelineHandlerRPi::registerCamera(MediaDevice *unicam, MediaDevice *isp, Me<br>
* iterate over all streams in one go.<br>
*/<br>
data->streams_.push_back(&data->unicam_[Unicam::Image]);<br>
- if (sensorConfig.sensorMetadata)<br>
+ if (result.sensorConfig.sensorMetadata)<br>
data->streams_.push_back(&data->unicam_[Unicam::Embedded]);<br>
<br>
for (auto &stream : data->isp_)<br>
@@ -1275,15 +1274,16 @@ int PipelineHandlerRPi::registerCamera(MediaDevice *unicam, MediaDevice *isp, Me<br>
* gain and exposure delays. Mark VBLANK for priority write.<br>
*/<br>
std::unordered_map<uint32_t, DelayedControls::ControlParams> params = {<br>
- { V4L2_CID_ANALOGUE_GAIN, { sensorConfig.gainDelay, false } },<br>
- { V4L2_CID_EXPOSURE, { sensorConfig.exposureDelay, false } },<br>
- { V4L2_CID_VBLANK, { sensorConfig.vblankDelay, true } }<br>
+ { V4L2_CID_ANALOGUE_GAIN, { result.sensorConfig.gainDelay, false } },<br>
+ { V4L2_CID_EXPOSURE, { result.sensorConfig.exposureDelay, false } },<br>
+ { V4L2_CID_VBLANK, { result.sensorConfig.vblankDelay, true } }<br>
};<br>
data->delayedCtrls_ = std::make_unique<DelayedControls>(data->sensor_->device(), params);<br>
- data->sensorMetadata_ = sensorConfig.sensorMetadata;<br>
+ data->sensorMetadata_ = result.sensorConfig.sensorMetadata;<br>
+<br>
+ /* Register initial controls that the Raspberry Pi IPA can handle. */<br>
+ data->controlInfo_ = std::move(result.controlInfo);<br>
<br>
- /* Register the controls that the Raspberry Pi IPA can handle. */<br>
- data->controlInfo_ = RPi::Controls;<br>
/* Initialize the camera properties. */<br>
data->properties_ = data->sensor_->properties();<br>
<br>
@@ -1509,7 +1509,7 @@ void RPiCameraData::frameStarted(uint32_t sequence)<br>
delayedCtrls_->applyControls(sequence);<br>
}<br>
<br>
-int RPiCameraData::loadIPA(ipa::RPi::SensorConfig *sensorConfig)<br>
+int RPiCameraData::loadIPA(ipa::RPi::IPAInitResult *result)<br>
{<br>
ipa_ = IPAManager::createIPA<ipa::RPi::IPAProxyRPi>(pipe(), 1, 1);<br>
<br>
@@ -1535,7 +1535,7 @@ int RPiCameraData::loadIPA(ipa::RPi::SensorConfig *sensorConfig)<br>
<br>
IPASettings settings(configurationFile, sensor_->model());<br>
<br>
- return ipa_->init(settings, sensorConfig);<br>
+ return ipa_->init(settings, result);<br>
}<br>
<br>
int RPiCameraData::configureIPA(const CameraConfiguration *config, ipa::RPi::IPAConfigResult *result)<br>
diff --git a/src/libcamera/pipeline/raspberrypi/rpi_stream.h b/src/libcamera/pipeline/raspberrypi/rpi_stream.h<br>
index c37f7e82eef6..fe01110019b7 100644<br>
--- a/src/libcamera/pipeline/raspberrypi/rpi_stream.h<br>
+++ b/src/libcamera/pipeline/raspberrypi/rpi_stream.h<br>
@@ -12,7 +12,6 @@<br>
#include <unordered_map><br>
#include <vector><br>
<br>
-#include <libcamera/ipa/raspberrypi.h><br>
#include <libcamera/ipa/raspberrypi_ipa_interface.h><br>
#include <libcamera/stream.h><br>
<br>
-- <br>
2.25.1<br>
<br>
</blockquote></div>