PawletOS/external_libcamera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libcamera: framebuffer: Replace vector with span in constructor

Browse Source 
The FrameBuffer constructor takes a list of planes as an std::vector.
The caller may stores the planes in a different type of container,
resulting in the needless allocation of a temporary vector. Replace it
with a span.

Suggested-by: Daniel Rákos <daniel.rakos@rastergrid.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Reviewed-by: Barnabás Pőcze <barnabas.pocze@ideasonboard.com>
This commit is contained in:
Laurent Pinchart
2025-08-12 19:48:36 +03:00
parent 5e351b89f0
commit b8d332cdcc
12 changed files with 38 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/libcamera/framebuffer.h
View File

@@ -58,11 +58,11 @@ public:
unsigned int length; unsigned int length;
}; };
FrameBuffer(const std::vector<Plane> &planes, unsigned int cookie = 0); FrameBuffer(Span<const Plane> planes, unsigned int cookie = 0);
FrameBuffer(std::unique_ptr<Private> d); FrameBuffer(std::unique_ptr<Private> d);
virtual ~FrameBuffer() {} virtual ~FrameBuffer() {}
const std::vector<Plane> &planes() const; Span<const Plane> planes() const;
Request *request() const; Request *request() const;
const FrameMetadata &metadata() const; const FrameMetadata &metadata() const;

3
include/libcamera/internal/framebuffer.h
View File

@@ -12,6 +12,7 @@
#include <utility> #include <utility>
#include <libcamera/base/class.h> #include <libcamera/base/class.h>
#include <libcamera/base/span.h>
#include <libcamera/fence.h> #include <libcamera/fence.h>
#include <libcamera/framebuffer.h> #include <libcamera/framebuffer.h>
@@ -23,7 +24,7 @@ class FrameBuffer::Private : public Extensible::Private
LIBCAMERA_DECLARE_PUBLIC(FrameBuffer) LIBCAMERA_DECLARE_PUBLIC(FrameBuffer)
public: public:
Private(const std::vector<Plane> &planes, uint64_t cookie = 0); Private(Span<const Plane> planes, uint64_t cookie = 0);
virtual ~Private(); virtual ~Private();
void setRequest(Request *request) { request_ = request; } void setRequest(Request *request) { request_ = request; }

2
src/android/mm/cros_frame_buffer_allocator.cpp
View File

@@ -29,7 +29,7 @@ class CrosFrameBufferData : public FrameBuffer::Private
public: public:
CrosFrameBufferData(cros::ScopedBufferHandle scopedHandle, CrosFrameBufferData(cros::ScopedBufferHandle scopedHandle,
const std::vector<FrameBuffer::Plane> &planes) Span<const FrameBuffer::Plane> planes)
: FrameBuffer::Private(planes), scopedHandle_(std::move(scopedHandle)) : FrameBuffer::Private(planes), scopedHandle_(std::move(scopedHandle))
{ {
} }

2
src/android/mm/generic_frame_buffer_allocator.cpp
View File

@@ -35,7 +35,7 @@ class GenericFrameBufferData : public FrameBuffer::Private
public: public:
GenericFrameBufferData(struct alloc_device_t *allocDevice, GenericFrameBufferData(struct alloc_device_t *allocDevice,
buffer_handle_t handle, buffer_handle_t handle,
const std::vector<FrameBuffer::Plane> &planes) Span<const FrameBuffer::Plane> planes)
: FrameBuffer::Private(planes), allocDevice_(allocDevice), : FrameBuffer::Private(planes), allocDevice_(allocDevice),
handle_(handle) handle_(handle)
{ {

10
src/libcamera/framebuffer.cpp
View File

@@ -130,9 +130,9 @@ LOG_DEFINE_CATEGORY(Buffer)
* \param[in] planes The frame memory planes * \param[in] planes The frame memory planes
* \param[in] cookie Cookie * \param[in] cookie Cookie
*/ */
FrameBuffer::Private::Private(const std::vector<Plane> &planes, uint64_t cookie) FrameBuffer::Private::Private(Span<const Plane> planes, uint64_t cookie)
: planes_(planes), cookie_(cookie), request_(nullptr), : planes_(planes.begin(), planes.end()), cookie_(cookie),
isContiguous_(true) request_(nullptr), isContiguous_(true)
{ {
metadata_.planes_.resize(planes_.size()); metadata_.planes_.resize(planes_.size());
} }
@@ -315,7 +315,7 @@ ino_t fileDescriptorInode(const SharedFD &fd)
* \param[in] planes The frame memory planes * \param[in] planes The frame memory planes
* \param[in] cookie Cookie * \param[in] cookie Cookie
*/ */
FrameBuffer::FrameBuffer(const std::vector<Plane> &planes, unsigned int cookie) FrameBuffer::FrameBuffer(Span<const Plane> planes, unsigned int cookie)
: FrameBuffer(std::make_unique<Private>(planes, cookie)) : FrameBuffer(std::make_unique<Private>(planes, cookie))
{ {
} }
@@ -365,7 +365,7 @@ FrameBuffer::FrameBuffer(std::unique_ptr<Private> d)
* \brief Retrieve the static plane descriptors * \brief Retrieve the static plane descriptors
* \return Array of plane descriptors * \return Array of plane descriptors
*/ */
const std::vector<FrameBuffer::Plane> &FrameBuffer::planes() const Span<const FrameBuffer::Plane> FrameBuffer::planes() const
{ {
return _d()->planes_; return _d()->planes_;
} }

6
src/libcamera/pipeline/ipu3/ipu3.cpp
View File

@@ -680,8 +680,12 @@ int PipelineHandlerIPU3::allocateBuffers(Camera *camera)
auto pushBuffers = [&](const std::vector<std::unique_ptr<FrameBuffer>> &buffers) { auto pushBuffers = [&](const std::vector<std::unique_ptr<FrameBuffer>> &buffers) {
for (const std::unique_ptr<FrameBuffer> &buffer : buffers) { for (const std::unique_ptr<FrameBuffer> &buffer : buffers) {
Span<const FrameBuffer::Plane> planes = buffer->planes();
buffer->setCookie(ipaBufferId++); buffer->setCookie(ipaBufferId++);
ipaBuffers_.emplace_back(buffer->cookie(), buffer->planes()); ipaBuffers_.emplace_back(buffer->cookie(),
std::vector<FrameBuffer::Plane>{ planes.begin(),
planes.end() });
} }
}; };

6
src/libcamera/pipeline/mali-c55/mali-c55.cpp
View File

@@ -1137,8 +1137,12 @@ int PipelineHandlerMaliC55::allocateBuffers(Camera *camera)
std::queue<FrameBuffer *> &queue, std::queue<FrameBuffer *> &queue,
std::vector<IPABuffer> &ipaBuffers) { std::vector<IPABuffer> &ipaBuffers) {
for (const std::unique_ptr<FrameBuffer> &buffer : buffers) { for (const std::unique_ptr<FrameBuffer> &buffer : buffers) {
Span<const FrameBuffer::Plane> planes = buffer->planes();
buffer->setCookie(ipaBufferId++); buffer->setCookie(ipaBufferId++);
ipaBuffers.emplace_back(buffer->cookie(), buffer->planes()); ipaBuffers.emplace_back(buffer->cookie(),
std::vector<FrameBuffer::Plane>{ planes.begin(),
planes.end() });
queue.push(buffer.get()); queue.push(buffer.get());
} }
}; };

5
src/libcamera/pipeline/rkisp1/rkisp1.cpp
View File

@@ -1031,9 +1031,12 @@ int PipelineHandlerRkISP1::allocateBuffers(Camera *camera)
auto pushBuffers = [&](const std::vector<std::unique_ptr<FrameBuffer>> &buffers, auto pushBuffers = [&](const std::vector<std::unique_ptr<FrameBuffer>> &buffers,
std::queue<FrameBuffer *> &queue) { std::queue<FrameBuffer *> &queue) {
for (const std::unique_ptr<FrameBuffer> &buffer : buffers) { for (const std::unique_ptr<FrameBuffer> &buffer : buffers) {
Span<const FrameBuffer::Plane> planes = buffer->planes();
buffer->setCookie(ipaBufferId++); buffer->setCookie(ipaBufferId++);
data->ipaBuffers_.emplace_back(buffer->cookie(), data->ipaBuffers_.emplace_back(buffer->cookie(),
buffer->planes()); std::vector<FrameBuffer::Plane>{ planes.begin(),
planes.end() });
queue.push(buffer.get()); queue.push(buffer.get());
} }
}; };

6
src/libcamera/pipeline/rpi/common/pipeline_base.cpp
View File

@@ -883,8 +883,10 @@ void PipelineHandlerBase::mapBuffers(Camera *camera, const BufferMap &buffers, u
* handler and the IPA. * handler and the IPA.
*/ */
for (auto const &[id, buffer] : buffers) { for (auto const &[id, buffer] : buffers) {
bufferIds.push_back(IPABuffer(mask | id, Span<const FrameBuffer::Plane> planes = buffer.buffer->planes();
buffer.buffer->planes()));
bufferIds.emplace_back(mask | id,
std::vector<FrameBuffer::Plane>{ planes.begin(), planes.end() });
data->bufferIds_.insert(mask | id); data->bufferIds_.insert(mask | id);
} }

5
src/libcamera/pipeline/vimc/vimc.cpp
View File

@@ -363,8 +363,11 @@ int PipelineHandlerVimc::start(Camera *camera, [[maybe_unused]] const ControlLis
/* Map the mock IPA buffers to VIMC IPA to exercise IPC code paths. */ /* Map the mock IPA buffers to VIMC IPA to exercise IPC code paths. */
std::vector<IPABuffer> ipaBuffers; std::vector<IPABuffer> ipaBuffers;
for (auto [i, buffer] : utils::enumerate(data->mockIPABufs_)) { for (auto [i, buffer] : utils::enumerate(data->mockIPABufs_)) {
Span<const FrameBuffer::Plane> planes = buffer->planes();
buffer->setCookie(i + 1); buffer->setCookie(i + 1);
ipaBuffers.emplace_back(buffer->cookie(), buffer->planes()); ipaBuffers.emplace_back(buffer->cookie(),
std::vector<FrameBuffer::Plane>{ planes.begin(), planes.end() });
} }
data->ipa_->mapBuffers(ipaBuffers); data->ipa_->mapBuffers(ipaBuffers);

3
src/libcamera/pipeline/virtual/virtual.cpp
View File

@@ -315,7 +315,8 @@ int PipelineHandlerVirtual::queueRequestDevice([[maybe_unused]] Camera *camera,
fmd.sequence = streamConfig.seq++; fmd.sequence = streamConfig.seq++;
fmd.timestamp = timestamp; fmd.timestamp = timestamp;
for (const auto [i, p] : utils::enumerate(buffer->planes())) Span<const FrameBuffer::Plane> planes = buffer->planes();
for (const auto [i, p] : utils::enumerate(planes))
fmd.planes()[i].bytesused = p.length; fmd.planes()[i].bytesused = p.length;
found = true; found = true;

6
src/libcamera/v4l2_videodevice.cpp
View File

@@ -288,7 +288,7 @@ V4L2BufferCache::Entry::Entry(bool free, uint64_t lastUsed, const FrameBuffer &b
bool V4L2BufferCache::Entry::operator==(const FrameBuffer &buffer) const bool V4L2BufferCache::Entry::operator==(const FrameBuffer &buffer) const
{ {
const std::vector<FrameBuffer::Plane> &planes = buffer.planes(); Span<const FrameBuffer::Plane> planes = buffer.planes();
if (planes_.size() != planes.size()) if (planes_.size() != planes.size())
return false; return false;
@@ -1676,7 +1676,7 @@ int V4L2VideoDevice::queueBuffer(FrameBuffer *buffer)
buf.field = V4L2_FIELD_NONE; buf.field = V4L2_FIELD_NONE;
bool multiPlanar = V4L2_TYPE_IS_MULTIPLANAR(buf.type); bool multiPlanar = V4L2_TYPE_IS_MULTIPLANAR(buf.type);
const std::vector<FrameBuffer::Plane> &planes = buffer->planes(); Span<const FrameBuffer::Plane> planes = buffer->planes();
const unsigned int numV4l2Planes = format_.planesCount; const unsigned int numV4l2Planes = format_.planesCount;
/* /*
@@ -1909,7 +1909,7 @@ FrameBuffer *V4L2VideoDevice::dequeueBuffer()
} }
metadata.sequence -= firstFrame_.value(); metadata.sequence -= firstFrame_.value();
const std::vector<FrameBuffer::Plane> &framebufferPlanes = buffer->planes(); Span<const FrameBuffer::Plane> framebufferPlanes = buffer->planes();
unsigned int numV4l2Planes = multiPlanar ? buf.length : 1; unsigned int numV4l2Planes = multiPlanar ? buf.length : 1;
if (numV4l2Planes != framebufferPlanes.size()) { if (numV4l2Planes != framebufferPlanes.size()) {