@@ -496,9 +496,16 @@ void IpaBase::prepareIsp(const PrepareParams ¶ms)
if (controller_.getHardwareConfig().statsInline)
processStats({ params.buffers, params.ipaContext });
+ /* The Bayer image buffer, plus its fd, is passed to all the IPAs. */
+ auto bayerIt = buffers_.find(params.buffers.bayer);
+ auto bayerFdIt = buffersFds_.find(params.buffers.bayer);
+ ASSERT(bayerIt != buffers_.end() && bayerFdIt != buffersFds_.end());
+ const RPiController::SharedBuffer bayerBuffer{ bayerFdIt->second,
+ bayerIt->second.planes()[0] };
+
/* Do we need/want to call prepare? */
if (processPending_) {
- controller_.prepare(&rpiMetadata);
+ controller_.prepare(&rpiMetadata, bayerBuffer);
/* Actually prepare the ISP parameters for the frame. */
platformPrepareIsp(params, rpiMetadata);
platformPrepareAgc(rpiMetadata);
@@ -23,7 +23,8 @@ void Algorithm::switchMode([[maybe_unused]] CameraMode const &cameraMode,
{
}
-void Algorithm::prepare([[maybe_unused]] Metadata *imageMetadata)
+void Algorithm::prepare([[maybe_unused]] Metadata *imageMetadata,
+ [[maybe_unused]] const SharedBuffer &bayerBuffer)
{
}
@@ -35,7 +35,7 @@ public:
virtual int read(const libcamera::ValueNode ¶ms);
virtual void initialise();
virtual void switchMode(CameraMode const &cameraMode, Metadata *metadata);
- virtual void prepare(Metadata *imageMetadata);
+ virtual void prepare(Metadata *imageMetadata, const SharedBuffer &bayerBuffer);
virtual void process(StatisticsPtr &stats, Metadata *imageMetadata);
Metadata &getGlobalMetadata() const
{
@@ -192,11 +192,11 @@ void Controller::switchMode(CameraMode const &cameraMode, Metadata *metadata)
switchModeCalled_ = true;
}
-void Controller::prepare(Metadata *imageMetadata)
+void Controller::prepare(Metadata *imageMetadata, const SharedBuffer &bayerBuffer)
{
assert(switchModeCalled_);
for (auto &algo : algorithms_)
- algo->prepare(imageMetadata);
+ algo->prepare(imageMetadata, bayerBuffer);
}
void Controller::process(StatisticsPtr stats, Metadata *imageMetadata)
@@ -12,9 +12,13 @@
* convenient manner.
*/
-#include <vector>
+#include <span>
+#include <stdint.h>
#include <string>
+#include <utility>
+#include <vector>
+#include <libcamera/base/shared_fd.h>
#include <libcamera/base/utils.h>
#include "libcamera/internal/value_node.h"
@@ -28,6 +32,9 @@ namespace RPiController {
class Algorithm;
typedef std::unique_ptr<Algorithm> AlgorithmPtr;
+/* A shorthand for tying together a buffer with its shared FD. */
+using SharedBuffer = std::pair<libcamera::SharedFD, std::span<uint8_t>>;
+
/*
* The Controller holds a pointer to some global_metadata, which is how
* different controllers and control algorithms within them can exchange
@@ -57,7 +64,7 @@ public:
int read(char const *filename);
void initialise();
void switchMode(CameraMode const &cameraMode, Metadata *metadata);
- void prepare(Metadata *imageMetadata);
+ void prepare(Metadata *imageMetadata, const SharedBuffer &bayerBuffer);
void process(StatisticsPtr stats, Metadata *imageMetadata);
Metadata &getGlobalMetadata();
Algorithm *getAlgorithm(std::string const &name) const;
@@ -772,7 +772,8 @@ void Af::goIdle()
* so we can terminate the scan early without having to change our minds.
*/
-void Af::prepare(Metadata *imageMetadata)
+void Af::prepare(Metadata *imageMetadata,
+ [[maybe_unused]] const SharedBuffer &bayerBuffer)
{
/* Initialize for triggered scan or start of CAF mode */
if (scanState_ == ScanState::Trigger)
@@ -52,7 +52,7 @@ public:
/* IPA calls */
void switchMode(CameraMode const &cameraMode, Metadata *metadata) override;
- void prepare(Metadata *imageMetadata) override;
+ void prepare(Metadata *imageMetadata, const SharedBuffer &bayerBuffer) override;
void process(StatisticsPtr &stats, Metadata *imageMetadata) override;
/* controls */
@@ -297,7 +297,8 @@ setCurrentChannelIndexGetExposure(Metadata *metadata, const char *message, unsig
return dur;
}
-void Agc::prepare(Metadata *imageMetadata)
+void Agc::prepare(Metadata *imageMetadata,
+ [[maybe_unused]] const SharedBuffer &bayerBuffer)
{
/*
* The DeviceStatus in the metadata should be correct for the image we
@@ -47,7 +47,7 @@ public:
void disableAutoGain() override;
bool autoGainEnabled() const override;
void switchMode(CameraMode const &cameraMode, Metadata *metadata) override;
- void prepare(Metadata *imageMetadata) override;
+ void prepare(Metadata *imageMetadata, const SharedBuffer &bayerBuffer) override;
void process(StatisticsPtr &stats, Metadata *imageMetadata) override;
void setActiveChannels(const std::vector<unsigned int> &activeChannels) override;
@@ -381,7 +381,8 @@ void Alsc::restartAsync(StatisticsPtr &stats, Metadata *imageMetadata)
asyncSignal_.notify_one();
}
-void Alsc::prepare(Metadata *imageMetadata)
+void Alsc::prepare(Metadata *imageMetadata,
+ [[maybe_unused]] const SharedBuffer &bayerBuffer)
{
/*
* Count frames since we started, and since we last poked the async
@@ -113,7 +113,7 @@ public:
void initialise() override;
void switchMode(CameraMode const &cameraMode, Metadata *metadata) override;
int read(const libcamera::ValueNode ¶ms) override;
- void prepare(Metadata *imageMetadata) override;
+ void prepare(Metadata *imageMetadata, const SharedBuffer &bayerBuffer) override;
void process(StatisticsPtr &stats, Metadata *imageMetadata) override;
private:
@@ -295,7 +295,8 @@ void Awb::restartAsync(StatisticsPtr &stats, double lux)
asyncSignal_.notify_one();
}
-void Awb::prepare(Metadata *imageMetadata)
+void Awb::prepare(Metadata *imageMetadata,
+ [[maybe_unused]] const SharedBuffer &bayerBuffer)
{
if (frameCount_ < (int)config_.startupFrames)
frameCount_++;
@@ -77,7 +77,7 @@ public:
void enableAuto() override;
void disableAuto() override;
void switchMode(CameraMode const &cameraMode, Metadata *metadata) override;
- void prepare(Metadata *imageMetadata) override;
+ void prepare(Metadata *imageMetadata, const SharedBuffer &bayerBuffer) override;
void process(StatisticsPtr &stats, Metadata *imageMetadata) override;
static double interpolateQuadatric(libcamera::ipa::Pwl::Point const &a,
@@ -52,7 +52,8 @@ void BlackLevel::initialValues(uint16_t &blackLevelR, uint16_t &blackLevelG,
blackLevelB = blackLevelB_;
}
-void BlackLevel::prepare(Metadata *imageMetadata)
+void BlackLevel::prepare(Metadata *imageMetadata,
+ [[maybe_unused]] const SharedBuffer &bayerBuffer)
{
/*
* Possibly we should think about doing this in a switchMode or
@@ -21,7 +21,7 @@ public:
int read(const libcamera::ValueNode ¶ms) override;
void initialValues(uint16_t &blackLevelR, uint16_t &blackLevelG,
uint16_t &blackLevelB) override;
- void prepare(Metadata *imageMetadata) override;
+ void prepare(Metadata *imageMetadata, const SharedBuffer &bayerBuffer) override;
private:
double blackLevelR_;
@@ -93,7 +93,8 @@ int Cac::read(const libcamera::ValueNode ¶ms)
return 0;
}
-void Cac::prepare(Metadata *imageMetadata)
+void Cac::prepare(Metadata *imageMetadata,
+ [[maybe_unused]] const SharedBuffer &bayerBuffer)
{
if (config_.enabled)
imageMetadata->set("cac.status", cacStatus_);
@@ -25,7 +25,7 @@ public:
Cac(Controller *controller = NULL);
char const *name() const override;
int read(const libcamera::ValueNode ¶ms) override;
- void prepare(Metadata *imageMetadata) override;
+ void prepare(Metadata *imageMetadata, const SharedBuffer &bayerBuffer) override;
private:
CacConfig config_;
@@ -146,7 +146,8 @@ Matrix3x3 applySaturation(Matrix3x3 const &ccm, double saturation)
} /* namespace */
-void Ccm::prepare(Metadata *imageMetadata)
+void Ccm::prepare(Metadata *imageMetadata,
+ [[maybe_unused]] const SharedBuffer &bayerBuffer)
{
bool awbOk = false, luxOk = false;
struct AwbStatus awb = {};
@@ -36,7 +36,7 @@ public:
void setSaturation(double saturation) override;
void setCcm(Matrix3x3 const &matrix) override;
void initialise() override;
- void prepare(Metadata *imageMetadata) override;
+ void prepare(Metadata *imageMetadata, const SharedBuffer &bayerBuffer) override;
private:
CcmConfig config_;
@@ -89,7 +89,8 @@ void Contrast::initialise()
status_.gammaCurve = config_.gammaCurve;
}
-void Contrast::prepare(Metadata *imageMetadata)
+void Contrast::prepare(Metadata *imageMetadata,
+ [[maybe_unused]] const SharedBuffer &bayerBuffer)
{
imageMetadata->set("contrast.status", status_);
}
@@ -41,7 +41,7 @@ public:
void enableCe(bool enable) override;
void restoreCe() override;
void initialise() override;
- void prepare(Metadata *imageMetadata) override;
+ void prepare(Metadata *imageMetadata, const SharedBuffer &bayerBuffer) override;
void process(StatisticsPtr &stats, Metadata *imageMetadata) override;
private:
@@ -49,7 +49,8 @@ void Decompand::initialValues(libcamera::ipa::Pwl &decompandCurve)
decompandCurve = {};
}
-void Decompand::prepare(Metadata *imageMetadata)
+void Decompand::prepare(Metadata *imageMetadata,
+ [[maybe_unused]] const SharedBuffer &bayerBuffer)
{
DecompandStatus decompandStatus;
@@ -22,7 +22,7 @@ public:
void initialise() override;
void switchMode(CameraMode const &cameraMode, Metadata *metadata) override;
void initialValues(libcamera::ipa::Pwl &decompandCurve) override;
- void prepare(Metadata *imageMetadata) override;
+ void prepare(Metadata *imageMetadata, const SharedBuffer &bayerBuffer) override;
private:
CameraMode mode_;
@@ -122,7 +122,8 @@ void Denoise::switchMode([[maybe_unused]] CameraMode const &cameraMode,
currentCdnDeviation_ = currentConfig_->cdnDeviationNoTdn;
}
-void Denoise::prepare(Metadata *imageMetadata)
+void Denoise::prepare(Metadata *imageMetadata,
+ [[maybe_unused]] const SharedBuffer &bayerBuffer)
{
struct NoiseStatus noiseStatus = {};
noiseStatus.noiseSlope = 3.0; // in case no metadata
@@ -42,7 +42,7 @@ public:
int read(const libcamera::ValueNode ¶ms) override;
void initialise() override;
void switchMode(CameraMode const &cameraMode, Metadata *metadata) override;
- void prepare(Metadata *imageMetadata) override;
+ void prepare(Metadata *imageMetadata, const SharedBuffer &bayerBuffer) override;
void setMode(DenoiseMode mode) override;
void setConfig(std::string const &name) override;
@@ -42,7 +42,8 @@ int Dpc::read(const libcamera::ValueNode ¶ms)
return 0;
}
-void Dpc::prepare(Metadata *imageMetadata)
+void Dpc::prepare(Metadata *imageMetadata,
+ [[maybe_unused]] const SharedBuffer &bayerBuffer)
{
DpcStatus dpcStatus = {};
/* Should we vary this with lux level or analogue gain? TBD. */
@@ -23,7 +23,7 @@ public:
Dpc(Controller *controller);
char const *name() const override;
int read(const libcamera::ValueNode ¶ms) override;
- void prepare(Metadata *imageMetadata) override;
+ void prepare(Metadata *imageMetadata, const SharedBuffer &bayerBuffer) override;
private:
DpcConfig config_;
@@ -52,7 +52,8 @@ int Geq::read(const libcamera::ValueNode ¶ms)
return 0;
}
-void Geq::prepare(Metadata *imageMetadata)
+void Geq::prepare(Metadata *imageMetadata,
+ [[maybe_unused]] const SharedBuffer &bayerBuffer)
{
LuxStatus luxStatus = {};
luxStatus.lux = 400;
@@ -27,7 +27,7 @@ public:
Geq(Controller *controller);
char const *name() const override;
int read(const libcamera::ValueNode ¶ms) override;
- void prepare(Metadata *imageMetadata) override;
+ void prepare(Metadata *imageMetadata, const SharedBuffer &bayerBuffer) override;
private:
GeqConfig config_;
@@ -174,7 +174,8 @@ void Hdr::switchMode([[maybe_unused]] CameraMode const &cameraMode, Metadata *me
delayedStatus_ = status_;
}
-void Hdr::prepare(Metadata *imageMetadata)
+void Hdr::prepare(Metadata *imageMetadata,
+ [[maybe_unused]] const SharedBuffer &bayerBuffer)
{
AgcStatus agcStatus;
if (!imageMetadata->get<AgcStatus>("agc.delayed_status", agcStatus))
@@ -62,7 +62,7 @@ public:
char const *name() const override;
void switchMode(CameraMode const &cameraMode, Metadata *metadata) override;
int read(const libcamera::ValueNode ¶ms) override;
- void prepare(Metadata *imageMetadata) override;
+ void prepare(Metadata *imageMetadata, const SharedBuffer &bayerBuffer) override;
void process(StatisticsPtr &stats, Metadata *imageMetadata) override;
int setMode(std::string const &mode) override;
std::vector<unsigned int> getChannels() const override;
@@ -75,7 +75,8 @@ void Lux::switchMode(CameraMode const &cameraMode, [[maybe_unused]] Metadata *me
sensitivity_ = cameraMode.sensitivity;
}
-void Lux::prepare(Metadata *imageMetadata)
+void Lux::prepare(Metadata *imageMetadata,
+ [[maybe_unused]] const SharedBuffer &bayerBuffer)
{
std::unique_lock<std::mutex> lock(mutex_);
imageMetadata->set("lux.status", status_);
@@ -25,7 +25,7 @@ public:
char const *name() const override;
int read(const libcamera::ValueNode ¶ms) override;
void switchMode(CameraMode const &cameraMode, Metadata *metadata) override;
- void prepare(Metadata *imageMetadata) override;
+ void prepare(Metadata *imageMetadata, const SharedBuffer &bayerBuffer) override;
void process(StatisticsPtr &stats, Metadata *imageMetadata) override;
void setCurrentAperture(double aperture);
@@ -56,7 +56,8 @@ int Noise::read(const libcamera::ValueNode ¶ms)
return 0;
}
-void Noise::prepare(Metadata *imageMetadata)
+void Noise::prepare(Metadata *imageMetadata,
+ [[maybe_unused]] const SharedBuffer &bayerBuffer)
{
struct DeviceStatus deviceStatus;
deviceStatus.analogueGain = 1.0; /* keep compiler calm */
@@ -20,7 +20,7 @@ public:
char const *name() const override;
void switchMode(CameraMode const &cameraMode, Metadata *metadata) override;
int read(const libcamera::ValueNode ¶ms) override;
- void prepare(Metadata *imageMetadata) override;
+ void prepare(Metadata *imageMetadata, const SharedBuffer &bayerBuffer) override;
private:
/* the noise profile for analogue gain of 1.0 */
@@ -39,7 +39,8 @@ void Saturation::initialise()
{
}
-void Saturation::prepare(Metadata *imageMetadata)
+void Saturation::prepare(Metadata *imageMetadata,
+ [[maybe_unused]] const SharedBuffer &bayerBuffer)
{
SaturationStatus saturation;
@@ -23,7 +23,7 @@ public:
char const *name() const override;
int read(const libcamera::ValueNode ¶ms) override;
void initialise() override;
- void prepare(Metadata *imageMetadata) override;
+ void prepare(Metadata *imageMetadata, const SharedBuffer &bayerBuffer) override;
private:
SaturationConfig config_;
@@ -46,7 +46,8 @@ void Sdn::initialise()
{
}
-void Sdn::prepare(Metadata *imageMetadata)
+void Sdn::prepare(Metadata *imageMetadata,
+ [[maybe_unused]] const SharedBuffer &bayerBuffer)
{
struct NoiseStatus noiseStatus = {};
noiseStatus.noiseSlope = 3.0; /* in case no metadata */
@@ -20,7 +20,7 @@ public:
char const *name() const override;
int read(const libcamera::ValueNode ¶ms) override;
void initialise() override;
- void prepare(Metadata *imageMetadata) override;
+ void prepare(Metadata *imageMetadata, const SharedBuffer &bayerBuffer) override;
void setMode(DenoiseMode mode) override;
private:
@@ -61,7 +61,8 @@ void Sharpen::setStrength(double strength)
userStrength_ = std::max(0.0, strength);
}
-void Sharpen::prepare(Metadata *imageMetadata)
+void Sharpen::prepare(Metadata *imageMetadata,
+ [[maybe_unused]] const SharedBuffer &bayerBuffer)
{
/*
* The userStrength_ affects the algorithm's internal gain directly, but
@@ -21,7 +21,7 @@ public:
void switchMode(CameraMode const &cameraMode, Metadata *metadata) override;
int read(const libcamera::ValueNode ¶ms) override;
void setStrength(double strength) override;
- void prepare(Metadata *imageMetadata) override;
+ void prepare(Metadata *imageMetadata, const SharedBuffer &bayerBuffer) override;
private:
double threshold_;
@@ -41,7 +41,8 @@ void Tonemap::initialise()
{
}
-void Tonemap::prepare(Metadata *imageMetadata)
+void Tonemap::prepare(Metadata *imageMetadata,
+ [[maybe_unused]] const SharedBuffer &bayerBuffer)
{
TonemapStatus tonemapStatus;
@@ -27,7 +27,7 @@ public:
char const *name() const override;
int read(const libcamera::ValueNode ¶ms) override;
void initialise() override;
- void prepare(Metadata *imageMetadata) override;
+ void prepare(Metadata *imageMetadata, const SharedBuffer &bayerBuffer) override;
private:
TonemapConfig config_;
The raw stream buffer, plus its shared fd, is now passed to all the control algorithms. The Controller and Algorithm prepare methods have been updated to accept the raw buffer (though none makes use of it at the moment). Signed-off-by: David Plowman <david.plowman@raspberrypi.com> --- src/ipa/rpi/common/ipa_base.cpp | 9 ++++++++- src/ipa/rpi/controller/algorithm.cpp | 3 ++- src/ipa/rpi/controller/algorithm.h | 2 +- src/ipa/rpi/controller/controller.cpp | 4 ++-- src/ipa/rpi/controller/controller.h | 11 +++++++++-- src/ipa/rpi/controller/rpi/af.cpp | 3 ++- src/ipa/rpi/controller/rpi/af.h | 2 +- src/ipa/rpi/controller/rpi/agc.cpp | 3 ++- src/ipa/rpi/controller/rpi/agc.h | 2 +- src/ipa/rpi/controller/rpi/alsc.cpp | 3 ++- src/ipa/rpi/controller/rpi/alsc.h | 2 +- src/ipa/rpi/controller/rpi/awb.cpp | 3 ++- src/ipa/rpi/controller/rpi/awb.h | 2 +- src/ipa/rpi/controller/rpi/black_level.cpp | 3 ++- src/ipa/rpi/controller/rpi/black_level.h | 2 +- src/ipa/rpi/controller/rpi/cac.cpp | 3 ++- src/ipa/rpi/controller/rpi/cac.h | 2 +- src/ipa/rpi/controller/rpi/ccm.cpp | 3 ++- src/ipa/rpi/controller/rpi/ccm.h | 2 +- src/ipa/rpi/controller/rpi/contrast.cpp | 3 ++- src/ipa/rpi/controller/rpi/contrast.h | 2 +- src/ipa/rpi/controller/rpi/decompand.cpp | 3 ++- src/ipa/rpi/controller/rpi/decompand.h | 2 +- src/ipa/rpi/controller/rpi/denoise.cpp | 3 ++- src/ipa/rpi/controller/rpi/denoise.h | 2 +- src/ipa/rpi/controller/rpi/dpc.cpp | 3 ++- src/ipa/rpi/controller/rpi/dpc.h | 2 +- src/ipa/rpi/controller/rpi/geq.cpp | 3 ++- src/ipa/rpi/controller/rpi/geq.h | 2 +- src/ipa/rpi/controller/rpi/hdr.cpp | 3 ++- src/ipa/rpi/controller/rpi/hdr.h | 2 +- src/ipa/rpi/controller/rpi/lux.cpp | 3 ++- src/ipa/rpi/controller/rpi/lux.h | 2 +- src/ipa/rpi/controller/rpi/noise.cpp | 3 ++- src/ipa/rpi/controller/rpi/noise.h | 2 +- src/ipa/rpi/controller/rpi/saturation.cpp | 3 ++- src/ipa/rpi/controller/rpi/saturation.h | 2 +- src/ipa/rpi/controller/rpi/sdn.cpp | 3 ++- src/ipa/rpi/controller/rpi/sdn.h | 2 +- src/ipa/rpi/controller/rpi/sharpen.cpp | 3 ++- src/ipa/rpi/controller/rpi/sharpen.h | 2 +- src/ipa/rpi/controller/rpi/tonemap.cpp | 3 ++- src/ipa/rpi/controller/rpi/tonemap.h | 2 +- 43 files changed, 79 insertions(+), 45 deletions(-)