NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

libcamera: software_isp: Track whether CCM is enabled

Browse source 
Applying color correction matrix (CCM) in software ISP is optional due
to performance reasons.  CCM is applied if and only if `Ccm' algorithm
is present in the tuning file.

Software ISP debayering is a performance critical piece of code and we
do not want to use dynamic conditionals there.  Therefore we pass
information about CCM application to debayering configuration and let it
select the right versions of debayering functions using templates.  This
is a trick similar to the previously used one for adding or not adding
an alpha channel to the output.

Debayering gets this information but it ignores it in this patch.
Actual processing with CCM is added in the followup patch.

Signed-off-by: Milan Zamazal <mzamazal@redhat.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Milan Zamazal <mzamazal@redhat.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
This commit is contained in:
Milan Zamazal 2025-03-26 10:08:46 +01:00 • committed by Kieran Bingham
parent 0c53fe5f2f
commit ac30686556
10 changed files with 60 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/libcamera/internal/software_isp/software_isp.h
View file

@ -99,6 +99,7 @@ private:
SharedMemObject<DebayerParams> sharedParams_; SharedMemObject<DebayerParams> sharedParams_;
DebayerParams debayerParams_; DebayerParams debayerParams_;
DmaBufAllocator dmaHeap_; DmaBufAllocator dmaHeap_;
bool ccmEnabled_;
std::unique_ptr<ipa::soft::IPAProxySoft> ipa_; std::unique_ptr<ipa::soft::IPAProxySoft> ipa_;
std::deque<FrameBuffer *> queuedInputBuffers_; std::deque<FrameBuffer *> queuedInputBuffers_;

2
include/libcamera/ipa/soft.mojom
View file

@ -17,7 +17,7 @@ interface IPASoftInterface {
libcamera.SharedFD fdStats, libcamera.SharedFD fdStats,
libcamera.SharedFD fdParams, libcamera.SharedFD fdParams,
libcamera.ControlInfoMap sensorCtrlInfoMap) libcamera.ControlInfoMap sensorCtrlInfoMap)
=> (int32 ret, libcamera.ControlInfoMap ipaControls); => (int32 ret, libcamera.ControlInfoMap ipaControls, bool ccmEnabled);
start() => (int32 ret); start() => (int32 ret);
stop(); stop();
configure(IPAConfigInfo configInfo) configure(IPAConfigInfo configInfo)

2
src/ipa/simple/algorithms/ccm.cpp
View file

@ -34,6 +34,8 @@ int Ccm::init([[maybe_unused]] IPAContext &context, const YamlObject &tuningData
return ret; return ret;
} }
context.ccmEnabled = true;
return 0; return 0;
} }

1
src/ipa/simple/ipa_context.h
View file

@ -82,6 +82,7 @@ struct IPAContext {
IPAActiveState activeState; IPAActiveState activeState;
FCQueue<IPAFrameContext> frameContexts; FCQueue<IPAFrameContext> frameContexts;
ControlInfoMap::Map ctrlMap; ControlInfoMap::Map ctrlMap;
bool ccmEnabled;
}; };
} /* namespace ipa::soft */ } /* namespace ipa::soft */

8
src/ipa/simple/soft_simple.cpp
View file

@ -51,7 +51,8 @@ public:
const SharedFD &fdStats, const SharedFD &fdStats,
const SharedFD &fdParams, const SharedFD &fdParams,
const ControlInfoMap &sensorInfoMap, const ControlInfoMap &sensorInfoMap,
ControlInfoMap *ipaControls) override; ControlInfoMap *ipaControls,
bool *ccmEnabled) override;
int configure(const IPAConfigInfo &configInfo) override; int configure(const IPAConfigInfo &configInfo) override;
int start() override; int start() override;
@ -89,7 +90,8 @@ int IPASoftSimple::init(const IPASettings &settings,
const SharedFD &fdStats, const SharedFD &fdStats,
const SharedFD &fdParams, const SharedFD &fdParams,
const ControlInfoMap &sensorInfoMap, const ControlInfoMap &sensorInfoMap,
ControlInfoMap *ipaControls) ControlInfoMap *ipaControls,
bool *ccmEnabled)
{ {
camHelper_ = CameraSensorHelperFactoryBase::create(settings.sensorModel); camHelper_ = CameraSensorHelperFactoryBase::create(settings.sensorModel);
if (!camHelper_) { if (!camHelper_) {
@ -125,6 +127,8 @@ int IPASoftSimple::init(const IPASettings &settings,
if (ret) if (ret)
return ret; return ret;
*ccmEnabled = context_.ccmEnabled;
params_ = nullptr; params_ = nullptr;
stats_ = nullptr; stats_ = nullptr;

3
src/libcamera/software_isp/debayer.cpp
View file

@ -57,10 +57,11 @@ Debayer::~Debayer()
} }
/** /**
* \fn int Debayer::configure(const StreamConfiguration &inputCfg, const std::vector<std::reference_wrapper<StreamConfiguration>> &outputCfgs) * \fn int Debayer::configure()
* \brief Configure the debayer object according to the passed in parameters * \brief Configure the debayer object according to the passed in parameters
* \param[in] inputCfg The input configuration * \param[in] inputCfg The input configuration
* \param[in] outputCfgs The output configurations * \param[in] outputCfgs The output configurations
* \param[in] ccmEnabled Whether a color correction matrix is applied
* *
* \return 0 on success, a negative errno on failure * \return 0 on success, a negative errno on failure
*/ */

3
src/libcamera/software_isp/debayer.h
View file

@ -33,7 +33,8 @@ public:
virtual ~Debayer() = 0; virtual ~Debayer() = 0;
virtual int configure(const StreamConfiguration &inputCfg, virtual int configure(const StreamConfiguration &inputCfg,
const std::vector<std::reference_wrapper<StreamConfiguration>> &outputCfgs) = 0; const std::vector<std::reference_wrapper<StreamConfiguration>> &outputCfgs,
bool ccmEnabled) = 0;
virtual std::vector<PixelFormat> formats(PixelFormat inputFormat) = 0; virtual std::vector<PixelFormat> formats(PixelFormat inputFormat) = 0;

42
src/libcamera/software_isp/debayer_cpu.cpp
View file

@ -114,7 +114,7 @@ DebayerCpu::~DebayerCpu() = default;
(prev[x] + curr[x - p] + curr[x + n] + next[x]) / (4 * (div)), \ (prev[x] + curr[x - p] + curr[x + n] + next[x]) / (4 * (div)), \
curr[x] / (div)) curr[x] / (div))
template<bool addAlphaByte> template<bool addAlphaByte, bool ccmEnabled>
void DebayerCpu::debayer8_BGBG_BGR888(uint8_t *dst, const uint8_t *src[]) void DebayerCpu::debayer8_BGBG_BGR888(uint8_t *dst, const uint8_t *src[])
{ {
DECLARE_SRC_POINTERS(uint8_t) DECLARE_SRC_POINTERS(uint8_t)
@ -125,7 +125,7 @@ void DebayerCpu::debayer8_BGBG_BGR888(uint8_t *dst, const uint8_t *src[])
} }
} }
template<bool addAlphaByte> template<bool addAlphaByte, bool ccmEnabled>
void DebayerCpu::debayer8_GRGR_BGR888(uint8_t *dst, const uint8_t *src[]) void DebayerCpu::debayer8_GRGR_BGR888(uint8_t *dst, const uint8_t *src[])
{ {
DECLARE_SRC_POINTERS(uint8_t) DECLARE_SRC_POINTERS(uint8_t)
@ -136,7 +136,7 @@ void DebayerCpu::debayer8_GRGR_BGR888(uint8_t *dst, const uint8_t *src[])
} }
} }
template<bool addAlphaByte> template<bool addAlphaByte, bool ccmEnabled>
void DebayerCpu::debayer10_BGBG_BGR888(uint8_t *dst, const uint8_t *src[]) void DebayerCpu::debayer10_BGBG_BGR888(uint8_t *dst, const uint8_t *src[])
{ {
DECLARE_SRC_POINTERS(uint16_t) DECLARE_SRC_POINTERS(uint16_t)
@ -148,7 +148,7 @@ void DebayerCpu::debayer10_BGBG_BGR888(uint8_t *dst, const uint8_t *src[])
} }
} }
template<bool addAlphaByte> template<bool addAlphaByte, bool ccmEnabled>
void DebayerCpu::debayer10_GRGR_BGR888(uint8_t *dst, const uint8_t *src[]) void DebayerCpu::debayer10_GRGR_BGR888(uint8_t *dst, const uint8_t *src[])
{ {
DECLARE_SRC_POINTERS(uint16_t) DECLARE_SRC_POINTERS(uint16_t)
@ -160,7 +160,7 @@ void DebayerCpu::debayer10_GRGR_BGR888(uint8_t *dst, const uint8_t *src[])
} }
} }
template<bool addAlphaByte> template<bool addAlphaByte, bool ccmEnabled>
void DebayerCpu::debayer12_BGBG_BGR888(uint8_t *dst, const uint8_t *src[]) void DebayerCpu::debayer12_BGBG_BGR888(uint8_t *dst, const uint8_t *src[])
{ {
DECLARE_SRC_POINTERS(uint16_t) DECLARE_SRC_POINTERS(uint16_t)
@ -172,7 +172,7 @@ void DebayerCpu::debayer12_BGBG_BGR888(uint8_t *dst, const uint8_t *src[])
} }
} }
template<bool addAlphaByte> template<bool addAlphaByte, bool ccmEnabled>
void DebayerCpu::debayer12_GRGR_BGR888(uint8_t *dst, const uint8_t *src[]) void DebayerCpu::debayer12_GRGR_BGR888(uint8_t *dst, const uint8_t *src[])
{ {
DECLARE_SRC_POINTERS(uint16_t) DECLARE_SRC_POINTERS(uint16_t)
@ -184,7 +184,7 @@ void DebayerCpu::debayer12_GRGR_BGR888(uint8_t *dst, const uint8_t *src[])
} }
} }
template<bool addAlphaByte> template<bool addAlphaByte, bool ccmEnabled>
void DebayerCpu::debayer10P_BGBG_BGR888(uint8_t *dst, const uint8_t *src[]) void DebayerCpu::debayer10P_BGBG_BGR888(uint8_t *dst, const uint8_t *src[])
{ {
const int widthInBytes = window_.width * 5 / 4; const int widthInBytes = window_.width * 5 / 4;
@ -210,7 +210,7 @@ void DebayerCpu::debayer10P_BGBG_BGR888(uint8_t *dst, const uint8_t *src[])
} }
} }
template<bool addAlphaByte> template<bool addAlphaByte, bool ccmEnabled>
void DebayerCpu::debayer10P_GRGR_BGR888(uint8_t *dst, const uint8_t *src[]) void DebayerCpu::debayer10P_GRGR_BGR888(uint8_t *dst, const uint8_t *src[])
{ {
const int widthInBytes = window_.width * 5 / 4; const int widthInBytes = window_.width * 5 / 4;
@ -231,7 +231,7 @@ void DebayerCpu::debayer10P_GRGR_BGR888(uint8_t *dst, const uint8_t *src[])
} }
} }
template<bool addAlphaByte> template<bool addAlphaByte, bool ccmEnabled>
void DebayerCpu::debayer10P_GBGB_BGR888(uint8_t *dst, const uint8_t *src[]) void DebayerCpu::debayer10P_GBGB_BGR888(uint8_t *dst, const uint8_t *src[])
{ {
const int widthInBytes = window_.width * 5 / 4; const int widthInBytes = window_.width * 5 / 4;
@ -252,7 +252,7 @@ void DebayerCpu::debayer10P_GBGB_BGR888(uint8_t *dst, const uint8_t *src[])
} }
} }
template<bool addAlphaByte> template<bool addAlphaByte, bool ccmEnabled>
void DebayerCpu::debayer10P_RGRG_BGR888(uint8_t *dst, const uint8_t *src[]) void DebayerCpu::debayer10P_RGRG_BGR888(uint8_t *dst, const uint8_t *src[])
{ {
const int widthInBytes = window_.width * 5 / 4; const int widthInBytes = window_.width * 5 / 4;
@ -368,11 +368,17 @@ int DebayerCpu::setupStandardBayerOrder(BayerFormat::Order order)
return 0; return 0;
} }
#define SET_DEBAYER_METHODS(method0, method1) \ #define SET_DEBAYER_METHODS(method0, method1) \
debayer0_ = addAlphaByte ? &DebayerCpu::method0<true> : &DebayerCpu::method0<false>; \ debayer0_ = addAlphaByte \
debayer1_ = addAlphaByte ? &DebayerCpu::method1<true> : &DebayerCpu::method1<false>; ? (ccmEnabled ? &DebayerCpu::method0<true, true> : &DebayerCpu::method0<true, false>) \
: (ccmEnabled ? &DebayerCpu::method0<false, true> : &DebayerCpu::method0<false, false>); \
debayer1_ = addAlphaByte \
? (ccmEnabled ? &DebayerCpu::method1<true, true> : &DebayerCpu::method1<true, false>) \
: (ccmEnabled ? &DebayerCpu::method1<false, true> : &DebayerCpu::method1<false, false>);
int DebayerCpu::setDebayerFunctions(PixelFormat inputFormat, PixelFormat outputFormat) int DebayerCpu::setDebayerFunctions(PixelFormat inputFormat,
PixelFormat outputFormat,
bool ccmEnabled)
{ {
BayerFormat bayerFormat = BayerFormat bayerFormat =
BayerFormat::fromPixelFormat(inputFormat); BayerFormat::fromPixelFormat(inputFormat);
@ -464,7 +470,8 @@ int DebayerCpu::setDebayerFunctions(PixelFormat inputFormat, PixelFormat outputF
} }
int DebayerCpu::configure(const StreamConfiguration &inputCfg, int DebayerCpu::configure(const StreamConfiguration &inputCfg,
const std::vector<std::reference_wrapper<StreamConfiguration>> &outputCfgs) const std::vector<std::reference_wrapper<StreamConfiguration>> &outputCfgs,
bool ccmEnabled)
{ {
if (getInputConfig(inputCfg.pixelFormat, inputConfig_) != 0) if (getInputConfig(inputCfg.pixelFormat, inputConfig_) != 0)
return -EINVAL; return -EINVAL;
@ -503,7 +510,10 @@ int DebayerCpu::configure(const StreamConfiguration &inputCfg,
return -EINVAL; return -EINVAL;
} }
if (setDebayerFunctions(inputCfg.pixelFormat, outputCfg.pixelFormat) != 0) int ret = setDebayerFunctions(inputCfg.pixelFormat,
outputCfg.pixelFormat,
ccmEnabled);
if (ret != 0)
return -EINVAL; return -EINVAL;
window_.x = ((inputCfg.size.width - outputCfg.size.width) / 2) & window_.x = ((inputCfg.size.width - outputCfg.size.width) / 2) &

29
src/libcamera/software_isp/debayer_cpu.h
View file

@ -1,7 +1,7 @@
/* SPDX-License-Identifier: LGPL-2.1-or-later */ /* SPDX-License-Identifier: LGPL-2.1-or-later */
/* /*
* Copyright (C) 2023, Linaro Ltd * Copyright (C) 2023, Linaro Ltd
* Copyright (C) 2023, Red Hat Inc. * Copyright (C) 2023-2025 Red Hat Inc.
* *
* Authors: * Authors:
* Hans de Goede <hdegoede@redhat.com> * Hans de Goede <hdegoede@redhat.com>
@ -31,7 +31,8 @@ public:
~DebayerCpu(); ~DebayerCpu();
int configure(const StreamConfiguration &inputCfg, int configure(const StreamConfiguration &inputCfg,
const std::vector<std::reference_wrapper<StreamConfiguration>> &outputCfgs); const std::vector<std::reference_wrapper<StreamConfiguration>> &outputCfgs,
bool ccmEnabled);
Size patternSize(PixelFormat inputFormat); Size patternSize(PixelFormat inputFormat);
std::vector<PixelFormat> formats(PixelFormat input); std::vector<PixelFormat> formats(PixelFormat input);
std::tuple<unsigned int, unsigned int> std::tuple<unsigned int, unsigned int>
@ -85,28 +86,28 @@ private:
using debayerFn = void (DebayerCpu::*)(uint8_t *dst, const uint8_t *src[]); using debayerFn = void (DebayerCpu::*)(uint8_t *dst, const uint8_t *src[]);
/* 8-bit raw bayer format */ /* 8-bit raw bayer format */
template<bool addAlphaByte> template<bool addAlphaByte, bool ccmEnabled>
void debayer8_BGBG_BGR888(uint8_t *dst, const uint8_t *src[]); void debayer8_BGBG_BGR888(uint8_t *dst, const uint8_t *src[]);
template<bool addAlphaByte> template<bool addAlphaByte, bool ccmEnabled>
void debayer8_GRGR_BGR888(uint8_t *dst, const uint8_t *src[]); void debayer8_GRGR_BGR888(uint8_t *dst, const uint8_t *src[]);
/* unpacked 10-bit raw bayer format */ /* unpacked 10-bit raw bayer format */
template<bool addAlphaByte> template<bool addAlphaByte, bool ccmEnabled>
void debayer10_BGBG_BGR888(uint8_t *dst, const uint8_t *src[]); void debayer10_BGBG_BGR888(uint8_t *dst, const uint8_t *src[]);
template<bool addAlphaByte> template<bool addAlphaByte, bool ccmEnabled>
void debayer10_GRGR_BGR888(uint8_t *dst, const uint8_t *src[]); void debayer10_GRGR_BGR888(uint8_t *dst, const uint8_t *src[]);
/* unpacked 12-bit raw bayer format */ /* unpacked 12-bit raw bayer format */
template<bool addAlphaByte> template<bool addAlphaByte, bool ccmEnabled>
void debayer12_BGBG_BGR888(uint8_t *dst, const uint8_t *src[]); void debayer12_BGBG_BGR888(uint8_t *dst, const uint8_t *src[]);
template<bool addAlphaByte> template<bool addAlphaByte, bool ccmEnabled>
void debayer12_GRGR_BGR888(uint8_t *dst, const uint8_t *src[]); void debayer12_GRGR_BGR888(uint8_t *dst, const uint8_t *src[]);
/* CSI-2 packed 10-bit raw bayer format (all the 4 orders) */ /* CSI-2 packed 10-bit raw bayer format (all the 4 orders) */
template<bool addAlphaByte> template<bool addAlphaByte, bool ccmEnabled>
void debayer10P_BGBG_BGR888(uint8_t *dst, const uint8_t *src[]); void debayer10P_BGBG_BGR888(uint8_t *dst, const uint8_t *src[]);
template<bool addAlphaByte> template<bool addAlphaByte, bool ccmEnabled>
void debayer10P_GRGR_BGR888(uint8_t *dst, const uint8_t *src[]); void debayer10P_GRGR_BGR888(uint8_t *dst, const uint8_t *src[]);
template<bool addAlphaByte> template<bool addAlphaByte, bool ccmEnabled>
void debayer10P_GBGB_BGR888(uint8_t *dst, const uint8_t *src[]); void debayer10P_GBGB_BGR888(uint8_t *dst, const uint8_t *src[]);
template<bool addAlphaByte> template<bool addAlphaByte, bool ccmEnabled>
void debayer10P_RGRG_BGR888(uint8_t *dst, const uint8_t *src[]); void debayer10P_RGRG_BGR888(uint8_t *dst, const uint8_t *src[]);
struct DebayerInputConfig { struct DebayerInputConfig {
@ -125,7 +126,9 @@ private:
int getInputConfig(PixelFormat inputFormat, DebayerInputConfig &config); int getInputConfig(PixelFormat inputFormat, DebayerInputConfig &config);
int getOutputConfig(PixelFormat outputFormat, DebayerOutputConfig &config); int getOutputConfig(PixelFormat outputFormat, DebayerOutputConfig &config);
int setupStandardBayerOrder(BayerFormat::Order order); int setupStandardBayerOrder(BayerFormat::Order order);
int setDebayerFunctions(PixelFormat inputFormat, PixelFormat outputFormat); int setDebayerFunctions(PixelFormat inputFormat,
PixelFormat outputFormat,
bool ccmEnabled);
void setupInputMemcpy(const uint8_t *linePointers[]); void setupInputMemcpy(const uint8_t *linePointers[]);
void shiftLinePointers(const uint8_t *linePointers[], const uint8_t *src); void shiftLinePointers(const uint8_t *linePointers[], const uint8_t *src);
void memcpyNextLine(const uint8_t *linePointers[]); void memcpyNextLine(const uint8_t *linePointers[]);

5
src/libcamera/software_isp/software_isp.cpp
View file

@ -132,7 +132,8 @@ SoftwareIsp::SoftwareIsp(PipelineHandler *pipe, const CameraSensor *sensor,
debayer_->getStatsFD(), debayer_->getStatsFD(),
sharedParams_.fd(), sharedParams_.fd(),
sensor->controls(), sensor->controls(),
ipaControls); ipaControls,
&ccmEnabled_);
if (ret) { if (ret) {
LOG(SoftwareIsp, Error) << "IPA init failed"; LOG(SoftwareIsp, Error) << "IPA init failed";
debayer_.reset(); debayer_.reset();
@ -244,7 +245,7 @@ int SoftwareIsp::configure(const StreamConfiguration &inputCfg,
if (ret < 0) if (ret < 0)
return ret; return ret;
return debayer_->configure(inputCfg, outputCfgs); return debayer_->configure(inputCfg, outputCfgs, ccmEnabled_);
} }
/** /**