[PATCH 02/16] libcamera: software_isp: Introduce arguments for parameters buffers
Milan Zamazal
mzamazal at redhat.com
Mon Aug 12 13:49:51 CEST 2024
Processing parameters in software ISP are currently passed by value.
This is unlike hardware pipelines, which use a ring of buffers for the
purpose and pass references to the buffers currently selected from the
ring rather than passing the whole parameters buffers.
This is a preparatory patch to introduce a similar mechanism in software
ISP, in order to resolve TODO #5. It adds a new argument paramsBufferId
for the future parameters buffer ids passed to the calls. The buffer
ids must be passed to the following groups of methods:
- IPASoftSimple::prepare, in order to create the parameters in the given
buffer for the corresponding frame processing.
- SoftwareIsp::saveParams, in order to signal that the parameters are
set by the IPA.
- Debayer::process, in order to get the buffer with the processing
parameters.
- SoftwareIsp::releaseIspParams, in order to signal that the selected
parameters buffer from the ring is no longer needed for the given
frame and can be reused. This is a newly introduced signal.
The type of the buffer id parameter is set to uint32_t because:
- It can be used in mojom.
- It is consistent with the similar types in the hardware pipelines.
- It covers file descriptor number range, which will be used as buffer
ids (more on this in followup patches).
This patch doesn't do more than adding the arguments, to keep the patch
simple. The buffer handling will be implemented in the followup
patches.
Signed-off-by: Milan Zamazal <mzamazal at redhat.com>
---
.../libcamera/internal/software_isp/software_isp.h | 3 ++-
include/libcamera/ipa/soft.mojom | 4 ++--
src/ipa/simple/soft_simple.cpp | 7 ++++---
src/libcamera/software_isp/debayer.cpp | 8 +++++++-
src/libcamera/software_isp/debayer.h | 6 +++++-
src/libcamera/software_isp/debayer_cpu.cpp | 6 +++++-
src/libcamera/software_isp/debayer_cpu.h | 4 +++-
src/libcamera/software_isp/software_isp.cpp | 13 ++++++++++---
8 files changed, 38 insertions(+), 13 deletions(-)
diff --git a/include/libcamera/internal/software_isp/software_isp.h b/include/libcamera/internal/software_isp/software_isp.h
index 4bb30f07..d2b47ecc 100644
--- a/include/libcamera/internal/software_isp/software_isp.h
+++ b/include/libcamera/internal/software_isp/software_isp.h
@@ -84,7 +84,8 @@ public:
Signal<const ControlList &> setSensorControls;
private:
- void saveIspParams();
+ void saveIspParams(uint32_t paramsBufferId);
+ void releaseIspParams(uint32_t paramsBufferId);
void setSensorCtrls(const ControlList &sensorControls);
void statsReady(uint32_t frame, uint32_t bufferId);
void inputReady(FrameBuffer *input);
diff --git a/include/libcamera/ipa/soft.mojom b/include/libcamera/ipa/soft.mojom
index 85c61824..1498aedf 100644
--- a/include/libcamera/ipa/soft.mojom
+++ b/include/libcamera/ipa/soft.mojom
@@ -24,11 +24,11 @@ interface IPASoftInterface {
=> (int32 ret);
[async] queueRequest(uint32 frame, libcamera.ControlList sensorControls);
- prepare(uint32 frame);
+ prepare(uint32 frame, uint32 paramsBufferId);
[async] processStats(uint32 frame, uint32 bufferId, libcamera.ControlList sensorControls);
};
interface IPASoftEventInterface {
setSensorControls(libcamera.ControlList sensorControls);
- setIspParams();
+ setIspParams(uint32 paramsBufferId);
};
diff --git a/src/ipa/simple/soft_simple.cpp b/src/ipa/simple/soft_simple.cpp
index 547d0fcf..9d5fe923 100644
--- a/src/ipa/simple/soft_simple.cpp
+++ b/src/ipa/simple/soft_simple.cpp
@@ -56,7 +56,7 @@ public:
void stop() override;
void queueRequest(const uint32_t frame, const ControlList &controls) override;
- void prepare(const uint32_t frame) override;
+ void prepare(const uint32_t frame, const uint32_t paramsBufferId) override;
void processStats(const uint32_t frame, const uint32_t bufferId,
const ControlList &sensorControls) override;
@@ -254,12 +254,13 @@ void IPASoftSimple::queueRequest(const uint32_t frame, const ControlList &contro
algo->queueRequest(context_, frame, frameContext, controls);
}
-void IPASoftSimple::prepare(const uint32_t frame)
+void IPASoftSimple::prepare(const uint32_t frame,
+ const uint32_t paramsBufferId)
{
IPAFrameContext &frameContext = context_.frameContexts.get(frame);
for (auto const &algo : algorithms())
algo->prepare(context_, frame, frameContext, params_);
- setIspParams.emit();
+ setIspParams.emit(paramsBufferId);
}
void IPASoftSimple::processStats(
diff --git a/src/libcamera/software_isp/debayer.cpp b/src/libcamera/software_isp/debayer.cpp
index e2295f35..8bd58c3d 100644
--- a/src/libcamera/software_isp/debayer.cpp
+++ b/src/libcamera/software_isp/debayer.cpp
@@ -94,9 +94,10 @@ Debayer::~Debayer()
*/
/**
- * \fn void Debayer::process(uint32_t frame, FrameBuffer *input, FrameBuffer *output, DebayerParams params)
+ * \fn void Debayer::process(uint32_t frame, const uint32_t paramsBufferId, FrameBuffer *input, FrameBuffer *output, DebayerParams params)
* \brief Process the bayer data into the requested format
* \param[in] frame The frame number
+ * \param[in] paramsBufferId The id of the params buffer in use
* \param[in] input The input buffer
* \param[in] output The output buffer
* \param[in] params The parameters to be used in debayering
@@ -124,4 +125,9 @@ Debayer::~Debayer()
* \brief Signals when the output buffer is ready
*/
+/**
+ * \var Signal<uint32_t> Debayer::releaseIspParams
+ * \brief Signals when the processing params are no longer needed
+ */
+
} /* namespace libcamera */
diff --git a/src/libcamera/software_isp/debayer.h b/src/libcamera/software_isp/debayer.h
index d7ca060d..93020735 100644
--- a/src/libcamera/software_isp/debayer.h
+++ b/src/libcamera/software_isp/debayer.h
@@ -40,12 +40,16 @@ public:
virtual std::tuple<unsigned int, unsigned int>
strideAndFrameSize(const PixelFormat &outputFormat, const Size &size) = 0;
- virtual void process(uint32_t frame, FrameBuffer *input, FrameBuffer *output, DebayerParams params) = 0;
+ virtual void process(uint32_t frame,
+ const uint32_t paramsBufferId,
+ FrameBuffer *input, FrameBuffer *output,
+ DebayerParams params) = 0;
virtual SizeRange sizes(PixelFormat inputFormat, const Size &inputSize) = 0;
Signal<FrameBuffer *> inputBufferReady;
Signal<FrameBuffer *> outputBufferReady;
+ Signal<uint32_t> releaseIspParams;
private:
virtual Size patternSize(PixelFormat inputFormat) = 0;
diff --git a/src/libcamera/software_isp/debayer_cpu.cpp b/src/libcamera/software_isp/debayer_cpu.cpp
index f7b3a7d1..20a15ae0 100644
--- a/src/libcamera/software_isp/debayer_cpu.cpp
+++ b/src/libcamera/software_isp/debayer_cpu.cpp
@@ -724,7 +724,9 @@ static inline int64_t timeDiff(timespec &after, timespec &before)
(int64_t)after.tv_nsec - (int64_t)before.tv_nsec;
}
-void DebayerCpu::process(uint32_t frame, FrameBuffer *input, FrameBuffer *output, DebayerParams params)
+void DebayerCpu::process(uint32_t frame,
+ const uint32_t paramsBufferId,
+ FrameBuffer *input, FrameBuffer *output, DebayerParams params)
{
timespec frameStartTime;
@@ -737,6 +739,8 @@ void DebayerCpu::process(uint32_t frame, FrameBuffer *input, FrameBuffer *output
red_ = swapRedBlueGains_ ? params.blue : params.red;
blue_ = swapRedBlueGains_ ? params.red : params.blue;
+ releaseIspParams.emit(paramsBufferId);
+
/* Copy metadata from the input buffer */
FrameMetadata &metadata = output->_d()->metadata();
metadata.status = input->metadata().status;
diff --git a/src/libcamera/software_isp/debayer_cpu.h b/src/libcamera/software_isp/debayer_cpu.h
index 2c47e7c6..0b5a5258 100644
--- a/src/libcamera/software_isp/debayer_cpu.h
+++ b/src/libcamera/software_isp/debayer_cpu.h
@@ -36,7 +36,9 @@ public:
std::vector<PixelFormat> formats(PixelFormat input);
std::tuple<unsigned int, unsigned int>
strideAndFrameSize(const PixelFormat &outputFormat, const Size &size);
- void process(uint32_t frame, FrameBuffer *input, FrameBuffer *output, DebayerParams params);
+ void process(uint32_t frame,
+ const uint32_t paramsBufferId,
+ FrameBuffer *input, FrameBuffer *output, DebayerParams params);
SizeRange sizes(PixelFormat inputFormat, const Size &inputSize);
/**
diff --git a/src/libcamera/software_isp/software_isp.cpp b/src/libcamera/software_isp/software_isp.cpp
index dbf27f31..0412b401 100644
--- a/src/libcamera/software_isp/software_isp.cpp
+++ b/src/libcamera/software_isp/software_isp.cpp
@@ -106,6 +106,7 @@ SoftwareIsp::SoftwareIsp(PipelineHandler *pipe, const CameraSensor *sensor)
debayer_ = std::make_unique<DebayerCpu>(std::move(stats));
debayer_->inputBufferReady.connect(this, &SoftwareIsp::inputReady);
debayer_->outputBufferReady.connect(this, &SoftwareIsp::outputReady);
+ debayer_->releaseIspParams.connect(this, &SoftwareIsp::releaseIspParams);
ipa_ = IPAManager::createIPA<ipa::soft::IPAProxySoft>(pipe, 0, 0);
if (!ipa_) {
@@ -352,16 +353,22 @@ void SoftwareIsp::stop()
*/
void SoftwareIsp::process(uint32_t frame, FrameBuffer *input, FrameBuffer *output)
{
- ipa_->prepare(frame);
+ /* \todo Provide a real value */
+ constexpr uint32_t paramsBufferId = 0;
+ ipa_->prepare(frame, paramsBufferId);
debayer_->invokeMethod(&DebayerCpu::process,
- ConnectionTypeQueued, frame, input, output, debayerParams_);
+ ConnectionTypeQueued, frame, paramsBufferId, input, output, debayerParams_);
}
-void SoftwareIsp::saveIspParams()
+void SoftwareIsp::saveIspParams([[maybe_unused]] uint32_t paramsBufferId)
{
debayerParams_ = *sharedParams_;
}
+void SoftwareIsp::releaseIspParams([[maybe_unused]] uint32_t paramsBufferId)
+{
+}
+
void SoftwareIsp::setSensorCtrls(const ControlList &sensorControls)
{
setSensorControls.emit(sensorControls);
--
2.44.1
More information about the libcamera-devel
mailing list