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

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>

1 files changed, 5 insertions, 5 deletions

diff --git a/src/libcamera/pipeline/rpi/common/rpi_stream.cpp b/src/libcamera/pipeline/rpi/common/rpi_stream.cpp
index 2bb10f25..3690667e 100644
--- a/src/libcamera/pipeline/rpi/common/rpi_stream.cpp
+++ b/src/libcamera/pipeline/rpi/common/rpi_stream.cpp
@@ -55,17 +55,17 @@ const BufferMap &Stream::getBuffers() const
 	return bufferMap_;
 }
 
-int Stream::getBufferId(FrameBuffer *buffer) const
+unsigned int Stream::getBufferId(FrameBuffer *buffer) const
 {
 	if (importOnly_)
-		return -1;
+		return 0;
 
 	/* Find the buffer in the map, and return the buffer id. */
 	auto it = std::find_if(bufferMap_.begin(), bufferMap_.end(),
 			       [&buffer](auto const &p) { return p.second == buffer; });
 
 	if (it == bufferMap_.end())
-		return -1;
+		return 0;
 
 	return it->first;
 }
@@ -77,10 +77,10 @@ void Stream::setExternalBuffer(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. */
-	ASSERT(id != -1 && (id & BufferMask::MaskExternalBuffer));
+	ASSERT(id & BufferMask::MaskExternalBuffer);
 	bufferMap_.erase(id);
 }