@@ -15,7 +15,7 @@ struct IPAConfigInfo {
interface IPASoftInterface {
init(libcamera.IPASettings settings,
libcamera.SharedFD fdStats,
- libcamera.SharedFD fdParams,
+ map<uint32, libcamera.SharedFD> fdParams,
libcamera.IPACameraSensorInfo sensorInfo,
libcamera.ControlInfoMap sensorControls)
=> (int32 ret, libcamera.ControlInfoMap ipaControls, bool ccmEnabled);
@@ -53,7 +53,7 @@ public:
int init(const IPASettings &settings,
const SharedFD &fdStats,
- const SharedFD &fdParams,
+ const std::map<uint32_t, SharedFD> &fdParams,
const IPACameraSensorInfo &sensorInfo,
const ControlInfoMap &sensorControls,
ControlInfoMap *ipaControls,
@@ -75,7 +75,7 @@ protected:
private:
void updateExposure(double exposureMSV);
- DebayerParams *params_;
+ std::map<unsigned int, DebayerParams *> paramsBuffers_;
SwIspStats *stats_;
std::unique_ptr<CameraSensorHelper> camHelper_;
ControlInfoMap sensorInfoMap_;
@@ -88,13 +88,13 @@ IPASoftSimple::~IPASoftSimple()
{
if (stats_)
munmap(stats_, sizeof(SwIspStats));
- if (params_)
- munmap(params_, sizeof(DebayerParams));
+ for (auto &item : paramsBuffers_)
+ munmap(item.second, sizeof(DebayerParams));
}
int IPASoftSimple::init(const IPASettings &settings,
const SharedFD &fdStats,
- const SharedFD &fdParams,
+ const std::map<uint32_t, SharedFD> &fdParams,
const IPACameraSensorInfo &sensorInfo,
const ControlInfoMap &sensorControls,
ControlInfoMap *ipaControls,
@@ -137,8 +137,6 @@ int IPASoftSimple::init(const IPASettings &settings,
return ret;
*ccmEnabled = context_.ccmEnabled;
-
- params_ = nullptr;
stats_ = nullptr;
if (!fdStats.isValid()) {
@@ -146,25 +144,26 @@ int IPASoftSimple::init(const IPASettings &settings,
return -ENODEV;
}
- if (!fdParams.isValid()) {
- LOG(IPASoft, Error) << "Invalid Parameters handle";
- return -ENODEV;
- }
+ for (auto &[bufferId, sharedFd] : fdParams) {
+ if (!sharedFd.isValid()) {
+ LOG(IPASoft, Error) << "Invalid Parameters handle";
+ return -ENODEV;
+ }
- {
void *mem = mmap(nullptr, sizeof(DebayerParams), PROT_WRITE,
- MAP_SHARED, fdParams.get(), 0);
+ MAP_SHARED, sharedFd.get(), 0);
if (mem == MAP_FAILED) {
LOG(IPASoft, Error) << "Unable to map Parameters";
return -errno;
}
- params_ = static_cast<DebayerParams *>(mem);
- params_->blackLevel = { { 0.0, 0.0, 0.0 } };
- params_->gamma = 1.0 / algorithms::kDefaultGamma;
- params_->contrastExp = 1.0;
- params_->gains = { { 1.0, 1.0, 1.0 } };
+ DebayerParams *params = static_cast<DebayerParams *>(mem);
+ params->blackLevel = { { 0.0, 0.0, 0.0 } };
+ params->gamma = 1.0 / algorithms::kDefaultGamma;
+ params->contrastExp = 1.0;
+ params->gains = { { 1.0, 1.0, 1.0 } };
/* combinedMatrix is reset for each frame. */
+ paramsBuffers_[bufferId] = params;
}
{
@@ -290,9 +289,10 @@ void IPASoftSimple::computeParams(const uint32_t frame,
context_.activeState.combinedMatrix = Matrix<float, 3, 3>::identity();
IPAFrameContext &frameContext = context_.frameContexts.get(frame);
+ DebayerParams *params = paramsBuffers_.at(paramsBufferId);
for (const auto &algo : algorithms())
- algo->prepare(context_, frame, frameContext, params_);
- params_->combinedMatrix = context_.activeState.combinedMatrix;
+ algo->prepare(context_, frame, frameContext, params);
+ params->combinedMatrix = context_.activeState.combinedMatrix;
paramsComputed.emit(paramsBufferId);
}
@@ -16,6 +16,7 @@
#include <unistd.h>
#include <libcamera/base/log.h>
+#include <libcamera/base/shared_fd.h>
#include <libcamera/base/thread.h>
#include <libcamera/base/utils.h>
@@ -125,6 +126,9 @@ SoftwareIsp::SoftwareIsp(PipelineHandler *pipe,
if (!debayer_)
debayer_ = std::make_unique<DebayerCpu>(std::move(stats), cm);
+ std::map<uint32_t, SharedFD> fdParams;
+ for (auto &[bufferId, item] : sharedParams_)
+ fdParams[bufferId] = item.fd();
debayer_->inputBufferReady.connect(this, &SoftwareIsp::inputReady);
debayer_->outputBufferReady.connect(this, &SoftwareIsp::outputReady);
debayer_->paramsBufferReady.connect(this, &SoftwareIsp::paramsBufferReady);
@@ -153,7 +157,7 @@ SoftwareIsp::SoftwareIsp(PipelineHandler *pipe,
ret = ipa_->init(IPASettings{ ipaTuningFile, sensor->model() },
debayer_->getStatsFD(),
- sharedParams_.begin()->second.fd(),
+ fdParams,
sensorInfo,
sensor->controls(),
ipaControls,
@@ -445,9 +449,9 @@ int SoftwareIsp::process(uint32_t frame, FrameBuffer *input, FrameBuffer *output
return 0;
}
-void SoftwareIsp::saveIspParams([[maybe_unused]] const uint32_t paramsBufferId)
+void SoftwareIsp::saveIspParams(const uint32_t paramsBufferId)
{
- debayerParams_ = *sharedParams_.begin()->second;
+ debayerParams_ = *sharedParams_.at(paramsBufferId);
}
void SoftwareIsp::paramsBufferReady(const uint32_t paramsBufferId)
Instead of the single parameters buffer file descriptor, pass the file descriptors of all the parameters buffers to the IPA and let it use them according to the passed buffer id. This means: - The file descriptors of all the buffers must be passed to the IPA. - The IPA must store mappings of the buffer ids to the corresponding buffers. - The current buffer id is passed to/from the IPA. The parameters buffers are still copied for debayering, this will be addressed in the next patch. Signed-off-by: Milan Zamazal <mzamazal@redhat.com> --- include/libcamera/ipa/soft.mojom | 2 +- src/ipa/simple/soft_simple.cpp | 40 ++++++++++----------- src/libcamera/software_isp/software_isp.cpp | 10 ++++-- 3 files changed, 28 insertions(+), 24 deletions(-)