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, 9 insertions, 9 deletions

diff --git a/src/libcamera/pipeline/rpi/common/rpi_stream.h b/src/libcamera/pipeline/rpi/common/rpi_stream.h
index b8bd79cf..1aae6749 100644
--- a/src/libcamera/pipeline/rpi/common/rpi_stream.h
+++ b/src/libcamera/pipeline/rpi/common/rpi_stream.h
@@ -58,7 +58,7 @@ public:
 
 	void setExportedBuffers(std::vector<std::unique_ptr<FrameBuffer>> *buffers);
 	const BufferMap &getBuffers() const;
-	int getBufferId(FrameBuffer *buffer) const;
+	unsigned int getBufferId(FrameBuffer *buffer) const;
 
 	void setExternalBuffer(FrameBuffer *buffer);
 	void removeExternalBuffer(FrameBuffer *buffer);
@@ -74,25 +74,25 @@ private:
 	class IdGenerator
 	{
 	public:
-		IdGenerator(int max)
+		IdGenerator(unsigned int max)
 			: max_(max), id_(0)
 		{
 		}
 
-		int get()
+		unsigned int get()
 		{
-			int id;
+			unsigned int id;
 			if (!recycle_.empty()) {
 				id = recycle_.front();
 				recycle_.pop();
 			} else {
-				id = id_++;
+				id = ++id_;
 				ASSERT(id_ <= max_);
 			}
 			return id;
 		}
 
-		void release(int id)
+		void release(unsigned int id)
 		{
 			recycle_.push(id);
 		}
@@ -104,9 +104,9 @@ private:
 		}
 
 	private:
-		int max_;
-		int id_;
-		std::queue<int> recycle_;
+		unsigned int max_;
+		unsigned int id_;
+		std::queue<unsigned int> recycle_;
 	};
 
 	void clearBuffers();