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

libcamera: software_isp: Replace malloc() with std::vector<>

Browse source 
libcamera is implemented in C++, use std::vector<> to manage the
dynamically allocated line buffers instead of malloc() and free(). This
simplifies the code and improves memory safety by ensuring no allocation
will be leaked.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Milan Zamazal <mzamazal@redhat.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Tested-by: Hans de Goede <hdegoede@redhat.com>
This commit is contained in:
Laurent Pinchart 2024-08-04 00:09:14 +03:00
parent 46275401e6
commit 57396a0e3f
2 changed files with 13 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -49,16 +49,9 @@ DebayerCpu::DebayerCpu(std::unique_ptr<SwStatsCpu> stats)
/* Initialize color lookup tables */ /* Initialize color lookup tables */
for (unsigned int i = 0; i < DebayerParams::kRGBLookupSize; i++) for (unsigned int i = 0; i < DebayerParams::kRGBLookupSize; i++)
red_[i] = green_[i] = blue_[i] = i; red_[i] = green_[i] = blue_[i] = i;
for (unsigned int i = 0; i < kMaxLineBuffers; i++)
lineBuffers_[i] = nullptr;
} }
DebayerCpu::~DebayerCpu() DebayerCpu::~DebayerCpu() = default;
{
for (unsigned int i = 0; i < kMaxLineBuffers; i++)
free(lineBuffers_[i]);
}
#define DECLARE_SRC_POINTERS(pixel_t) \ #define DECLARE_SRC_POINTERS(pixel_t) \
const pixel_t *prev = (const pixel_t *)src[0] + xShift_; \ const pixel_t *prev = (const pixel_t *)src[0] + xShift_; \
@ -526,13 +519,10 @@ int DebayerCpu::configure(const StreamConfiguration &inputCfg,
lineBufferPadding_ = inputConfig_.patternSize.width * inputConfig_.bpp / 8; lineBufferPadding_ = inputConfig_.patternSize.width * inputConfig_.bpp / 8;
lineBufferLength_ = window_.width * inputConfig_.bpp / 8 + lineBufferLength_ = window_.width * inputConfig_.bpp / 8 +
2 * lineBufferPadding_; 2 * lineBufferPadding_;
for (unsigned int i = 0;
i < (inputConfig_.patternSize.height + 1) && enableInputMemcpy_; if (enableInputMemcpy_) {
i++) { for (unsigned int i = 0; i <= inputConfig_.patternSize.height; i++)
free(lineBuffers_[i]); lineBuffers_[i].resize(lineBufferLength_);
lineBuffers_[i] = (uint8_t *)malloc(lineBufferLength_);
if (!lineBuffers_[i])
return -ENOMEM;
} }
measuredFrames_ = 0; measuredFrames_ = 0;
@ -587,9 +577,10 @@ void DebayerCpu::setupInputMemcpy(const uint8_t *linePointers[])
return; return;
for (unsigned int i = 0; i < patternHeight; i++) { for (unsigned int i = 0; i < patternHeight; i++) {
memcpy(lineBuffers_[i], linePointers[i + 1] - lineBufferPadding_, memcpy(lineBuffers_[i].data(),
linePointers[i + 1] - lineBufferPadding_,
lineBufferLength_); lineBufferLength_);
linePointers[i + 1] = lineBuffers_[i] + lineBufferPadding_; linePointers[i + 1] = lineBuffers_[i].data() + lineBufferPadding_;
} }
/* Point lineBufferIndex_ to first unused lineBuffer */ /* Point lineBufferIndex_ to first unused lineBuffer */
@ -614,9 +605,11 @@ void DebayerCpu::memcpyNextLine(const uint8_t *linePointers[])
if (!enableInputMemcpy_) if (!enableInputMemcpy_)
return; return;
memcpy(lineBuffers_[lineBufferIndex_], linePointers[patternHeight] - lineBufferPadding_, memcpy(lineBuffers_[lineBufferIndex_].data(),
linePointers[patternHeight] - lineBufferPadding_,
lineBufferLength_); lineBufferLength_);
linePointers[patternHeight] = lineBuffers_[lineBufferIndex_] + lineBufferPadding_; linePointers[patternHeight] = lineBuffers_[lineBufferIndex_].data()
+ lineBufferPadding_;
lineBufferIndex_ = (lineBufferIndex_ + 1) % (patternHeight + 1); lineBufferIndex_ = (lineBufferIndex_ + 1) % (patternHeight + 1);
} }

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

@ -146,7 +146,7 @@ private:
DebayerInputConfig inputConfig_; DebayerInputConfig inputConfig_;
DebayerOutputConfig outputConfig_; DebayerOutputConfig outputConfig_;
std::unique_ptr<SwStatsCpu> stats_; std::unique_ptr<SwStatsCpu> stats_;
uint8_t *lineBuffers_[kMaxLineBuffers]; std::vector<uint8_t> lineBuffers_[kMaxLineBuffers];
unsigned int lineBufferLength_; unsigned int lineBufferLength_;
unsigned int lineBufferPadding_; unsigned int lineBufferPadding_;
unsigned int lineBufferIndex_; unsigned int lineBufferIndex_;