Mirror/libcamera
1
0
Fork 0
mirror of https://git.libcamera.org/libcamera/libcamera.git synced 2025-07-26 01:55:51 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

pipeline: raspberrypi: rpi_stream: Set invalid buffer to id == 0

Browse source 
At present, the RPiStream buffer ids == -1 indicates an invalid value.
As a simplification, use id == 0 to indicate an invalid value. This
allows for better code readability.

As a consequence of this, use unsigned int for the buffer id values.

Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Naushir Patuck 2023-05-03 13:20:29 +01:00 • committed by Laurent Pinchart
parent 726e9274ea
commit 48e059fa3c
3 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/libcamera/pipeline/rpi/common/rpi_stream.cpp
View file

@ -55,17 +55,17 @@ const BufferMap &Stream::getBuffers() const
return bufferMap_; return bufferMap_;
} }
int Stream::getBufferId(FrameBuffer *buffer) const unsigned int Stream::getBufferId(FrameBuffer *buffer) const
{ {
if (importOnly_) if (importOnly_)
return -1; return 0;
/* Find the buffer in the map, and return the buffer id. */ /* Find the buffer in the map, and return the buffer id. */
auto it = std::find_if(bufferMap_.begin(), bufferMap_.end(), auto it = std::find_if(bufferMap_.begin(), bufferMap_.end(),
[&buffer](auto const &p) { return p.second == buffer; }); [&buffer](auto const &p) { return p.second == buffer; });
if (it == bufferMap_.end()) if (it == bufferMap_.end())
return -1; return 0;
return it->first; return it->first;
} }
@ -77,10 +77,10 @@ void Stream::setExternalBuffer(FrameBuffer *buffer)
void Stream::removeExternalBuffer(FrameBuffer *buffer) void Stream::removeExternalBuffer(FrameBuffer *buffer)
{ {
int id = getBufferId(buffer); unsigned int id = getBufferId(buffer);
/* Ensure we have this buffer in the stream, and it is marked external. */ /* Ensure we have this buffer in the stream, and it is marked external. */
ASSERT(id != -1 && (id & BufferMask::MaskExternalBuffer)); ASSERT(id & BufferMask::MaskExternalBuffer);
bufferMap_.erase(id); bufferMap_.erase(id);
} }

18
src/libcamera/pipeline/rpi/common/rpi_stream.h
View file

@ -58,7 +58,7 @@ public:
void setExportedBuffers(std::vector<std::unique_ptr<FrameBuffer>> *buffers); void setExportedBuffers(std::vector<std::unique_ptr<FrameBuffer>> *buffers);
const BufferMap &getBuffers() const; const BufferMap &getBuffers() const;
int getBufferId(FrameBuffer *buffer) const; unsigned int getBufferId(FrameBuffer *buffer) const;
void setExternalBuffer(FrameBuffer *buffer); void setExternalBuffer(FrameBuffer *buffer);
void removeExternalBuffer(FrameBuffer *buffer); void removeExternalBuffer(FrameBuffer *buffer);
@ -74,25 +74,25 @@ private:
class IdGenerator class IdGenerator
{ {
public: public:
IdGenerator(int max) IdGenerator(unsigned int max)
: max_(max), id_(0) : max_(max), id_(0)
{ {
} }
int get() unsigned int get()
{ {
int id; unsigned int id;
if (!recycle_.empty()) { if (!recycle_.empty()) {
id = recycle_.front(); id = recycle_.front();
recycle_.pop(); recycle_.pop();
} else { } else {
id = id_++; id = ++id_;
ASSERT(id_ <= max_); ASSERT(id_ <= max_);
} }
return id; return id;
} }
void release(int id) void release(unsigned int id)
{ {
recycle_.push(id); recycle_.push(id);
} }
@ -104,9 +104,9 @@ private:
} }
private: private:
int max_; unsigned int max_;
int id_; unsigned int id_;
std::queue<int> recycle_; std::queue<unsigned int> recycle_;
}; };
void clearBuffers(); void clearBuffers();

6
src/libcamera/pipeline/rpi/vc4/raspberrypi.cpp
View file

@ -1210,7 +1210,7 @@ int PipelineHandlerRPi::queueRequestDevice(Camera *camera, Request *request)
continue; continue;
FrameBuffer *buffer = request->findBuffer(stream); FrameBuffer *buffer = request->findBuffer(stream);
if (buffer && stream->getBufferId(buffer) == -1) { if (buffer && !stream->getBufferId(buffer)) {
/* /*
* This buffer is not recognised, so it must have been allocated * This buffer is not recognised, so it must have been allocated
* outside the v4l2 device. Store it in the stream buffer list * outside the v4l2 device. Store it in the stream buffer list
@ -2042,7 +2042,7 @@ void RPiCameraData::unicamBufferDequeue(FrameBuffer *buffer)
for (RPi::Stream &s : unicam_) { for (RPi::Stream &s : unicam_) {
index = s.getBufferId(buffer); index = s.getBufferId(buffer);
if (index != -1) { if (index) {
stream = &s; stream = &s;
break; break;
} }
@ -2098,7 +2098,7 @@ void RPiCameraData::ispOutputDequeue(FrameBuffer *buffer)
for (RPi::Stream &s : isp_) { for (RPi::Stream &s : isp_) {
index = s.getBufferId(buffer); index = s.getBufferId(buffer);
if (index != -1) { if (index) {
stream = &s; stream = &s;
break; break;
} }