| Message ID | 20260812185055.289021-9-johannes.goede@oss.qualcomm.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series |
|
| Related | show |
Hi Hans On Wed, Aug 12, 2026 at 08:50:55PM +0200, Hans de Goede wrote: > Rename the softisp IPA setIspParams signal to paramsComputed and pass > the frame-number as argument to make the softisp IPA behavior consistent > with other IPA implementations. > > Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> > Reviewed-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com> > Signed-off-by: Hans de Goede <johannes.goede@oss.qualcomm.com> Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com> > --- > include/libcamera/internal/software_isp/software_isp.h | 2 +- > include/libcamera/ipa/softisp.mojom | 2 +- > src/ipa/softisp/softisp.cpp | 2 +- > src/libcamera/software_isp/software_isp.cpp | 4 ++-- > 4 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/include/libcamera/internal/software_isp/software_isp.h b/include/libcamera/internal/software_isp/software_isp.h > index 64c77e65c..da893d242 100644 > --- a/include/libcamera/internal/software_isp/software_isp.h > +++ b/include/libcamera/internal/software_isp/software_isp.h > @@ -89,7 +89,7 @@ public: > Signal<const ControlList &> setSensorControls; > > private: > - void saveIspParams(); > + void saveIspParams(uint32_t frame); > void setSensorCtrls(const ControlList &sensorControls); > void statsReady(uint32_t frame, uint32_t bufferId); > void inputReady(FrameBuffer *input); > diff --git a/include/libcamera/ipa/softisp.mojom b/include/libcamera/ipa/softisp.mojom > index 55b6e4d7f..a892d84f1 100644 > --- a/include/libcamera/ipa/softisp.mojom > +++ b/include/libcamera/ipa/softisp.mojom > @@ -33,6 +33,6 @@ interface IPASoftIspInterface { > > interface IPASoftIspEventInterface { > setSensorControls(libcamera.ControlList sensorControls); > - setIspParams(); > + paramsComputed(uint32 frame); > metadataReady(uint32 frame, libcamera.ControlList metadata); > }; > diff --git a/src/ipa/softisp/softisp.cpp b/src/ipa/softisp/softisp.cpp > index b3f0d3fa6..aec04c528 100644 > --- a/src/ipa/softisp/softisp.cpp > +++ b/src/ipa/softisp/softisp.cpp > @@ -292,7 +292,7 @@ void IPASoftIsp::computeParams(const uint32_t frame) > algo->prepare(context_, frame, frameContext, params_); > params_->combinedMatrix = context_.activeState.combinedMatrix; > > - setIspParams.emit(); > + paramsComputed.emit(frame); > } > > void IPASoftIsp::processStats(const uint32_t frame, > diff --git a/src/libcamera/software_isp/software_isp.cpp b/src/libcamera/software_isp/software_isp.cpp > index f29f78c98..ae86c20a8 100644 > --- a/src/libcamera/software_isp/software_isp.cpp > +++ b/src/libcamera/software_isp/software_isp.cpp > @@ -171,7 +171,7 @@ SoftwareIsp::SoftwareIsp(PipelineHandler *pipe, const CameraSensor *sensor, > return; > } > > - ipa_->setIspParams.connect(this, &SoftwareIsp::saveIspParams); > + ipa_->paramsComputed.connect(this, &SoftwareIsp::saveIspParams); > ipa_->metadataReady.connect(this, > [this](uint32_t frame, const ControlList &metadata) { > metadataReady.emit(frame, metadata); > @@ -432,7 +432,7 @@ void SoftwareIsp::process(uint32_t frame, FrameBuffer *input, FrameBuffer *outpu > ConnectionTypeQueued, frame, input, output, debayerParams_); > } > > -void SoftwareIsp::saveIspParams() > +void SoftwareIsp::saveIspParams([[maybe_unused]] uint32_t frame) > { > debayerParams_ = *sharedParams_; > } > -- > 2.55.0 >
diff --git a/include/libcamera/internal/software_isp/software_isp.h b/include/libcamera/internal/software_isp/software_isp.h index 64c77e65c..da893d242 100644 --- a/include/libcamera/internal/software_isp/software_isp.h +++ b/include/libcamera/internal/software_isp/software_isp.h @@ -89,7 +89,7 @@ public: Signal<const ControlList &> setSensorControls; private: - void saveIspParams(); + void saveIspParams(uint32_t frame); void setSensorCtrls(const ControlList &sensorControls); void statsReady(uint32_t frame, uint32_t bufferId); void inputReady(FrameBuffer *input); diff --git a/include/libcamera/ipa/softisp.mojom b/include/libcamera/ipa/softisp.mojom index 55b6e4d7f..a892d84f1 100644 --- a/include/libcamera/ipa/softisp.mojom +++ b/include/libcamera/ipa/softisp.mojom @@ -33,6 +33,6 @@ interface IPASoftIspInterface { interface IPASoftIspEventInterface { setSensorControls(libcamera.ControlList sensorControls); - setIspParams(); + paramsComputed(uint32 frame); metadataReady(uint32 frame, libcamera.ControlList metadata); }; diff --git a/src/ipa/softisp/softisp.cpp b/src/ipa/softisp/softisp.cpp index b3f0d3fa6..aec04c528 100644 --- a/src/ipa/softisp/softisp.cpp +++ b/src/ipa/softisp/softisp.cpp @@ -292,7 +292,7 @@ void IPASoftIsp::computeParams(const uint32_t frame) algo->prepare(context_, frame, frameContext, params_); params_->combinedMatrix = context_.activeState.combinedMatrix; - setIspParams.emit(); + paramsComputed.emit(frame); } void IPASoftIsp::processStats(const uint32_t frame, diff --git a/src/libcamera/software_isp/software_isp.cpp b/src/libcamera/software_isp/software_isp.cpp index f29f78c98..ae86c20a8 100644 --- a/src/libcamera/software_isp/software_isp.cpp +++ b/src/libcamera/software_isp/software_isp.cpp @@ -171,7 +171,7 @@ SoftwareIsp::SoftwareIsp(PipelineHandler *pipe, const CameraSensor *sensor, return; } - ipa_->setIspParams.connect(this, &SoftwareIsp::saveIspParams); + ipa_->paramsComputed.connect(this, &SoftwareIsp::saveIspParams); ipa_->metadataReady.connect(this, [this](uint32_t frame, const ControlList &metadata) { metadataReady.emit(frame, metadata); @@ -432,7 +432,7 @@ void SoftwareIsp::process(uint32_t frame, FrameBuffer *input, FrameBuffer *outpu ConnectionTypeQueued, frame, input, output, debayerParams_); } -void SoftwareIsp::saveIspParams() +void SoftwareIsp::saveIspParams([[maybe_unused]] uint32_t frame) { debayerParams_ = *sharedParams_; }