@@ -17,6 +17,7 @@ struct IPAConfigInfo {
struct StartResult {
libcamera.ControlList controls;
int32 code;
+ uint32 paramBufferBytesUsed;
};
interface IPARkISP1Interface {
@@ -25,7 +26,9 @@ interface IPARkISP1Interface {
libcamera.IPACameraSensorInfo sensorInfo,
libcamera.ControlInfoMap sensorControls)
=> (int32 ret, libcamera.ControlInfoMap ipaControls);
- start(libcamera.ControlList controls) => (StartResult result);
+ start(libcamera.ControlList controls,
+ uint32 paramBufferId)
+ => (StartResult result);
stop();
configure(IPAConfigInfo configInfo,
@@ -54,7 +54,8 @@ public:
const IPACameraSensorInfo &sensorInfo,
const ControlInfoMap &sensorControls,
ControlInfoMap *ipaControls) override;
- void start(const ControlList &controls, StartResult *result) override;
+ void start(const ControlList &controls, const uint32_t paramBufferId,
+ StartResult *result) override;
void stop() override;
int configure(const IPAConfigInfo &ipaConfig,
@@ -74,6 +75,8 @@ protected:
std::string logPrefix() const override;
private:
+ uint32_t computeParamsInternal(IPAFrameContext &frameContext, const uint32_t bufferId);
+
void updateControls(ControlInfoMap *ipaControls);
ControlList getSensorControls(const IPAFrameContext &context);
@@ -210,9 +213,17 @@ int IPARkISP1::init(const IPASettings &settings, unsigned int hwRevision,
return 0;
}
-void IPARkISP1::start(const ControlList &controls, StartResult *result)
+void IPARkISP1::start(const ControlList &controls, const uint32_t paramBufferId,
+ StartResult *result)
{
IPAFrameContext &frameContext = context_.frameContexts.getOrInitContext(0, controls);
+
+ if (paramBufferId != 0)
+ result->paramBufferBytesUsed = computeParamsInternal(frameContext,
+ paramBufferId);
+ else
+ result->paramBufferBytesUsed = 0;
+
result->controls = getSensorControls(frameContext);
result->code = 0;
}
@@ -312,18 +323,24 @@ void IPARkISP1::initializeFrameContext(IPAFrameContext &fc, const ControlList &c
}
}
+uint32_t IPARkISP1::computeParamsInternal(IPAFrameContext &frameContext, const uint32_t bufferId)
+{
+ RkISP1Params params(context_.configuration.paramFormat,
+ mappedBuffers_.at(bufferId).planes()[0]);
+
+ for (const auto &algo : algorithms())
+ algo->prepare(context_, frameContext.frame(), frameContext, ¶ms);
+
+ return params.bytesused();
+}
+
void IPARkISP1::computeParams(const uint32_t frame, const uint32_t bufferId)
{
IPAFrameContext &frameContext = context_.frameContexts.getOrInitContext(frame);
if (bufferId != 0) {
- RkISP1Params params(context_.configuration.paramFormat,
- mappedBuffers_.at(bufferId).planes()[0]);
-
- for (const auto &algo : algorithms())
- algo->prepare(context_, frame, frameContext, ¶ms);
-
- paramsComputed.emit(frame, bufferId, params.bytesused());
+ uint32_t size = computeParamsInternal(frameContext, bufferId);
+ paramsComputed.emit(frame, bufferId, size);
}
ControlList ctrls = getSensorControls(frameContext);
@@ -104,8 +104,8 @@ public:
bool canUseDewarper_;
bool usesDewarper_;
-private:
void paramsComputed(unsigned int frame, unsigned int bufferId, unsigned int bytesused);
+private:
void setSensorControls(unsigned int frame,
const ControlList &sensorControls);
@@ -1200,14 +1200,30 @@ int PipelineHandlerRkISP1::start(Camera *camera, [[maybe_unused]] const ControlL
nextStatsToProcess_ = 0;
data->frame_ = 0;
+ uint32_t paramBufferId = 0;
+ FrameBuffer *paramBuffer = nullptr;
+ if (!isRaw_) {
+ paramBuffer = availableParamBuffers_.front();
+ paramBufferId = paramBuffer->cookie();
+ }
+
ipa::rkisp1::StartResult res;
data->ipa_->start(controls ? *controls : ControlList{ controls::controls },
+ paramBufferId,
&res);
if (res.code) {
LOG(RkISP1, Error)
<< "Failed to start IPA " << camera->id();
return ret;
}
+
+ if (paramBuffer) {
+ availableParamBuffers_.pop();
+ computingParamBuffers_.push({ paramBuffer, nextParamsSequence_++ });
+ paramsSyncHelper_.pushCorrection(0);
+ data->paramsComputed(0, paramBufferId, res.paramBufferBytesUsed);
+ }
+
actions += [&]() { data->ipa_->stop(); };
data->sensor_->setControls(&res.controls);
data->delayedCtrls_->reset();
The parameters for frame 0 are only active on frame 0 if the corresponding parameter buffer is queued before STREAMON is called on the ISP. Therefore the normal mechanics of calling ipa->computeParams() do not work, as it gets called after the first request is queued and therefore the ISP is already started. To fix that, handle the parameter buffer the same way the initial sensor controls are handled by passing it to the ipa->start() function and then queuing the params buffer before starting the isp. Signed-off-by: Stefan Klug <stefan.klug@ideasonboard.com> --- Changes in v3: - Moved bufferId== 0 check out of computeParamsInternal for better readability - setSensorControls is now emitted after paramsComputed but that must not be a problem - Dropped rby tag due to bigger changes Changes in v2: - Small cleanup - Fixed crash in raw case where a null buffer is passed on start - Collected tag --- include/libcamera/ipa/rkisp1.mojom | 5 +++- src/ipa/rkisp1/rkisp1.cpp | 35 ++++++++++++++++++------ src/libcamera/pipeline/rkisp1/rkisp1.cpp | 18 +++++++++++- 3 files changed, 47 insertions(+), 11 deletions(-)