@@ -14,13 +14,18 @@ struct IPAConfigInfo {
uint32 paramFormat;
};
+struct StartResult {
+ libcamera.ControlList controls;
+ int32 code;
+};
+
interface IPARkISP1Interface {
init(libcamera.IPASettings settings,
uint32 hwRevision, uint32 supportedBlocks,
libcamera.IPACameraSensorInfo sensorInfo,
libcamera.ControlInfoMap sensorControls)
=> (int32 ret, libcamera.ControlInfoMap ipaControls);
- start() => (int32 ret);
+ start(libcamera.ControlList controls) => (StartResult result);
stop();
configure(IPAConfigInfo configInfo,
@@ -53,7 +53,7 @@ public:
const IPACameraSensorInfo &sensorInfo,
const ControlInfoMap &sensorControls,
ControlInfoMap *ipaControls) override;
- int start() override;
+ void start(const ControlList &controls, StartResult *result) override;
void stop() override;
int configure(const IPAConfigInfo &ipaConfig,
@@ -206,10 +206,12 @@ int IPARkISP1::init(const IPASettings &settings, unsigned int hwRevision,
return 0;
}
-int IPARkISP1::start()
+void IPARkISP1::start(const ControlList &controls, StartResult *result)
{
- /* \todo Properly handle startup controls. */
- return 0;
+ IPAFrameContext frameContext = {};
+ initializeFrameContext(0, frameContext, controls);
+ result->controls = getSensorControls(frameContext);
+ result->code = 0;
}
void IPARkISP1::stop()
@@ -1240,13 +1240,17 @@ int PipelineHandlerRkISP1::start(Camera *camera, [[maybe_unused]] const ControlL
return ret;
actions += [&]() { freeBuffers(camera); };
- ret = data->ipa_->start();
- if (ret) {
+ ipa::rkisp1::StartResult res;
+ data->ipa_->start(controls ? *controls : ControlList{ controls::controls },
+ &res);
+ if (res.code) {
LOG(RkISP1, Error)
<< "Failed to start IPA " << camera->id();
return ret;
}
actions += [&]() { data->ipa_->stop(); };
+ data->sensor_->setControls(&res.controls);
+ data->delayedCtrls_->reset();
data->frame_ = 0;
Controls passed to Camera::start() are not handled at the moment. Implement that by initializing a separate frame context and then returning the controls synchronously to the caller. In the pipeline the controls get passed to the sensor before the call to streamOn() to ensure the controls are applied right away. Passing the controls to the pipeline using the setSensorControls signal is not appropriate because it is asynchronous and would reach the sensor too late (initial controls need to be applied before the sensor starts and before delayed controls initializes its start condition). Signed-off-by: Stefan Klug <stefan.klug@ideasonboard.com> --- Changes in v3: - reflowed commit message - Dropped control list copy and unnecesary temporary --- include/libcamera/ipa/rkisp1.mojom | 7 ++++++- src/ipa/rkisp1/rkisp1.cpp | 10 ++++++---- src/libcamera/pipeline/rkisp1/rkisp1.cpp | 8 ++++++-- 3 files changed, 18 insertions(+), 7 deletions(-)