[{"id":26938,"web_url":"https://patchwork.libcamera.org/comment/26938/","msgid":"","date":"2023-04-26T16:16:08","subject":"Re: [libcamera-devel] [PATCH 05/13] pipeline: raspberrypi:\n\trpi_stream: Set invalid buffer to id == 0","submitter":{"id":143,"url":"https://patchwork.libcamera.org/api/people/143/","name":"Jacopo Mondi","email":"jacopo.mondi@ideasonboard.com"},"content":"Hi Naush\n\nOn Wed, Apr 26, 2023 at 02:10:49PM +0100, Naushir Patuck via libcamera-devel wrote:\n> At present, the RPiStream buffer ids == -1 indicates an invalid value.\n> As a simplification, use id == 0 to indicate an invalid value. This\n> allows for better code readability.\n>\n> As a consequence of this, use unsigned int for the buffer id values.\n>\n> Signed-off-by: Naushir Patuck \n\nReviewed-by: Jacopo Mondi \n\nThanks\n j\n\n> ---\n> .../pipeline/rpi/common/rpi_stream.cpp | 10 +++++-----\n> src/libcamera/pipeline/rpi/common/rpi_stream.h | 18 +++++++++---------\n> src/libcamera/pipeline/rpi/vc4/raspberrypi.cpp | 6 +++---\n> 3 files changed, 17 insertions(+), 17 deletions(-)\n>\n> diff --git a/src/libcamera/pipeline/rpi/common/rpi_stream.cpp b/src/libcamera/pipeline/rpi/common/rpi_stream.cpp\n> index 2bb10f25d6ca..3690667e9aa6 100644\n> --- a/src/libcamera/pipeline/rpi/common/rpi_stream.cpp\n> +++ b/src/libcamera/pipeline/rpi/common/rpi_stream.cpp\n> @@ -55,17 +55,17 @@ const BufferMap &Stream::getBuffers() const\n> \treturn bufferMap_;\n> }\n>\n> -int Stream::getBufferId(FrameBuffer *buffer) const\n> +unsigned int Stream::getBufferId(FrameBuffer *buffer) const\n> {\n> \tif (importOnly_)\n> -\t\treturn -1;\n> +\t\treturn 0;\n>\n> \t/* Find the buffer in the map, and return the buffer id. */\n> \tauto it = std::find_if(bufferMap_.begin(), bufferMap_.end(),\n> \t\t\t [&buffer](auto const &p) { return p.second == buffer; });\n>\n> \tif (it == bufferMap_.end())\n> -\t\treturn -1;\n> +\t\treturn 0;\n>\n> \treturn it->first;\n> }\n> @@ -77,10 +77,10 @@ void Stream::setExternalBuffer(FrameBuffer *buffer)\n>\n> void Stream::removeExternalBuffer(FrameBuffer *buffer)\n> {\n> -\tint id = getBufferId(buffer);\n> +\tunsigned int id = getBufferId(buffer);\n>\n> \t/* Ensure we have this buffer in the stream, and it is marked external. */\n> -\tASSERT(id != -1 && (id & BufferMask::MaskExternalBuffer));\n> +\tASSERT(id & BufferMask::MaskExternalBuffer);\n> \tbufferMap_.erase(id);\n> }\n>\n> diff --git a/src/libcamera/pipeline/rpi/common/rpi_stream.h b/src/libcamera/pipeline/rpi/common/rpi_stream.h\n> index b8bd79cf1535..1aae674967e1 100644\n> --- a/src/libcamera/pipeline/rpi/common/rpi_stream.h\n> +++ b/src/libcamera/pipeline/rpi/common/rpi_stream.h\n> @@ -58,7 +58,7 @@ public:\n>\n> \tvoid setExportedBuffers(std::vector> *buffers);\n> \tconst BufferMap &getBuffers() const;\n> -\tint getBufferId(FrameBuffer *buffer) const;\n> +\tunsigned int getBufferId(FrameBuffer *buffer) const;\n>\n> \tvoid setExternalBuffer(FrameBuffer *buffer);\n> \tvoid removeExternalBuffer(FrameBuffer *buffer);\n> @@ -74,25 +74,25 @@ private:\n> \tclass IdGenerator\n> \t{\n> \tpublic:\n> -\t\tIdGenerator(int max)\n> +\t\tIdGenerator(unsigned int max)\n> \t\t\t: max_(max), id_(0)\n> \t\t{\n> \t\t}\n>\n> -\t\tint get()\n> +\t\tunsigned int get()\n> \t\t{\n> -\t\t\tint id;\n> +\t\t\tunsigned int id;\n> \t\t\tif (!recycle_.empty()) {\n> \t\t\t\tid = recycle_.front();\n> \t\t\t\trecycle_.pop();\n> \t\t\t} else {\n> -\t\t\t\tid = id_++;\n> +\t\t\t\tid = ++id_;\n> \t\t\t\tASSERT(id_ <= max_);\n> \t\t\t}\n> \t\t\treturn id;\n> \t\t}\n>\n> -\t\tvoid release(int id)\n> +\t\tvoid release(unsigned int id)\n> \t\t{\n> \t\t\trecycle_.push(id);\n> \t\t}\n> @@ -104,9 +104,9 @@ private:\n> \t\t}\n>\n> \tprivate:\n> -\t\tint max_;\n> -\t\tint id_;\n> -\t\tstd::queue recycle_;\n> +\t\tunsigned int max_;\n> +\t\tunsigned int id_;\n> +\t\tstd::queue recycle_;\n> \t};\n>\n> \tvoid clearBuffers();\n> diff --git a/src/libcamera/pipeline/rpi/vc4/raspberrypi.cpp b/src/libcamera/pipeline/rpi/vc4/raspberrypi.cpp\n> index cfde7f2e2229..e54bf1ef2c17 100644\n> --- a/src/libcamera/pipeline/rpi/vc4/raspberrypi.cpp\n> +++ b/src/libcamera/pipeline/rpi/vc4/raspberrypi.cpp\n> @@ -1210,7 +1210,7 @@ int PipelineHandlerRPi::queueRequestDevice(Camera *camera, Request *request)\n> \t\t\tcontinue;\n>\n> \t\tFrameBuffer *buffer = request->findBuffer(stream);\n> -\t\tif (buffer && stream->getBufferId(buffer) == -1) {\n> +\t\tif (buffer && !stream->getBufferId(buffer)) {\n> \t\t\t/*\n> \t\t\t * This buffer is not recognised, so it must have been allocated\n> \t\t\t * outside the v4l2 device. Store it in the stream buffer list\n> @@ -2042,7 +2042,7 @@ void RPiCameraData::unicamBufferDequeue(FrameBuffer *buffer)\n>\n> \tfor (RPi::Stream &s : unicam_) {\n> \t\tindex = s.getBufferId(buffer);\n> -\t\tif (index != -1) {\n> +\t\tif (index) {\n> \t\t\tstream = &s;\n> \t\t\tbreak;\n> \t\t}\n> @@ -2098,7 +2098,7 @@ void RPiCameraData::ispOutputDequeue(FrameBuffer *buffer)\n>\n> \tfor (RPi::Stream &s : isp_) {\n> \t\tindex = s.getBufferId(buffer);\n> -\t\tif (index != -1) {\n> +\t\tif (index) {\n> \t\t\tstream = &s;\n> \t\t\tbreak;\n> \t\t}\n> --\n> 2.34.1\n>","headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 1AD5CBDCBD\n\tfor ;\n\tWed, 26 Apr 2023 16:16:14 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 72507627DF;\n\tWed, 26 Apr 2023 18:16:13 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id B7ABB627D4\n\tfor ;\n\tWed, 26 Apr 2023 18:16:11 +0200 (CEST)","from ideasonboard.com (93-61-96-190.ip145.fastwebnet.it\n\t[93.61.96.190])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 2B880C7E;\n\tWed, 26 Apr 2023 18:16:00 +0200 (CEST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1682525773;\n\tbh=iEket3ICUGyUnkiAvOzB+UOMl6E/k5HwZfE9CnTAZ1w=;\n\th=Date:To:References:In-Reply-To:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc:\n\tFrom;\n\tb=urSxN/Hdxluwv0R5jEXq0R2iALRaS8ZYt9WWw3qLz3tTikZR1ilEu5FPoZuIWxITI\n\tbDyhxO60vNdbngyYjzr9sz5cAL2HaILFdEN6QKY5UoiHCYn41f8ly9FpucY/Po7NmZ\n\t/W+7w+CLTVYPcbYgbk3TN9OAIDLVEQQJG0NyU43i9D/U1m0/ibdrANamEfzWoCipKk\n\tRFANc87nkBkkPCdz26kEpmdR/MQUwxMNX01ZP8jzI4x6SHfJV8Q6XiTYHicxQrV8FS\n\tjEUOPCOlDvYFWnvi1xWkAoSncAdhSguuPSFlqw5qWLuN6LCVxZmqoCs1fjEhkA73QV\n\takqU5kG0R4vMQ==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1682525760;\n\tbh=iEket3ICUGyUnkiAvOzB+UOMl6E/k5HwZfE9CnTAZ1w=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=B/F9W3E7s0wemIooaDpJSH4t8MXia6g4hTHHrkpszcGtKvXqu5t82DGlsycxJabnE\n\tktTArLbWXlqdFqDYnyJnmPXqZSgjr8+z1GcZ0QjYkILvCQK3OJ8Mk62ggMVQgj1igY\n\tZfpmns3NjbtnU5HuVGj5XF4aM7lTeWUg5DNaoIt4="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"B/F9W3E7\"; dkim-atps=neutral","Date":"Wed, 26 Apr 2023 18:16:08 +0200","To":"Naushir Patuck ","Message-ID":"","References":"<20230426131057.21550-1-naush@raspberrypi.com>\n\t<20230426131057.21550-6-naush@raspberrypi.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20230426131057.21550-6-naush@raspberrypi.com>","Subject":"Re: [libcamera-devel] [PATCH 05/13] pipeline: raspberrypi:\n\trpi_stream: Set invalid buffer to id == 0","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","From":"Jacopo Mondi via libcamera-devel ","Reply-To":"Jacopo Mondi ","Cc":"libcamera-devel@lists.libcamera.org","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":26965,"web_url":"https://patchwork.libcamera.org/comment/26965/","msgid":"<20230427131837.GB26786@pendragon.ideasonboard.com>","date":"2023-04-27T13:18:37","subject":"Re: [libcamera-devel] [PATCH 05/13] pipeline: raspberrypi:\n\trpi_stream: Set invalid buffer to id == 0","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Naush,\n\nThank you for the patch.\n\nOn Wed, Apr 26, 2023 at 02:10:49PM +0100, Naushir Patuck via libcamera-devel wrote:\n> At present, the RPiStream buffer ids == -1 indicates an invalid value.\n> As a simplification, use id == 0 to indicate an invalid value. This\n> allows for better code readability.\n> \n> As a consequence of this, use unsigned int for the buffer id values.\n> \n> Signed-off-by: Naushir Patuck \n\nReviewed-by: Laurent Pinchart \n\n> ---\n> .../pipeline/rpi/common/rpi_stream.cpp | 10 +++++-----\n> src/libcamera/pipeline/rpi/common/rpi_stream.h | 18 +++++++++---------\n> src/libcamera/pipeline/rpi/vc4/raspberrypi.cpp | 6 +++---\n> 3 files changed, 17 insertions(+), 17 deletions(-)\n> \n> diff --git a/src/libcamera/pipeline/rpi/common/rpi_stream.cpp b/src/libcamera/pipeline/rpi/common/rpi_stream.cpp\n> index 2bb10f25d6ca..3690667e9aa6 100644\n> --- a/src/libcamera/pipeline/rpi/common/rpi_stream.cpp\n> +++ b/src/libcamera/pipeline/rpi/common/rpi_stream.cpp\n> @@ -55,17 +55,17 @@ const BufferMap &Stream::getBuffers() const\n> \treturn bufferMap_;\n> }\n> \n> -int Stream::getBufferId(FrameBuffer *buffer) const\n> +unsigned int Stream::getBufferId(FrameBuffer *buffer) const\n> {\n> \tif (importOnly_)\n> -\t\treturn -1;\n> +\t\treturn 0;\n> \n> \t/* Find the buffer in the map, and return the buffer id. */\n> \tauto it = std::find_if(bufferMap_.begin(), bufferMap_.end(),\n> \t\t\t [&buffer](auto const &p) { return p.second == buffer; });\n> \n> \tif (it == bufferMap_.end())\n> -\t\treturn -1;\n> +\t\treturn 0;\n> \n> \treturn it->first;\n> }\n> @@ -77,10 +77,10 @@ void Stream::setExternalBuffer(FrameBuffer *buffer)\n> \n> void Stream::removeExternalBuffer(FrameBuffer *buffer)\n> {\n> -\tint id = getBufferId(buffer);\n> +\tunsigned int id = getBufferId(buffer);\n> \n> \t/* Ensure we have this buffer in the stream, and it is marked external. */\n> -\tASSERT(id != -1 && (id & BufferMask::MaskExternalBuffer));\n> +\tASSERT(id & BufferMask::MaskExternalBuffer);\n> \tbufferMap_.erase(id);\n> }\n> \n> diff --git a/src/libcamera/pipeline/rpi/common/rpi_stream.h b/src/libcamera/pipeline/rpi/common/rpi_stream.h\n> index b8bd79cf1535..1aae674967e1 100644\n> --- a/src/libcamera/pipeline/rpi/common/rpi_stream.h\n> +++ b/src/libcamera/pipeline/rpi/common/rpi_stream.h\n> @@ -58,7 +58,7 @@ public:\n> \n> \tvoid setExportedBuffers(std::vector> *buffers);\n> \tconst BufferMap &getBuffers() const;\n> -\tint getBufferId(FrameBuffer *buffer) const;\n> +\tunsigned int getBufferId(FrameBuffer *buffer) const;\n> \n> \tvoid setExternalBuffer(FrameBuffer *buffer);\n> \tvoid removeExternalBuffer(FrameBuffer *buffer);\n> @@ -74,25 +74,25 @@ private:\n> \tclass IdGenerator\n> \t{\n> \tpublic:\n> -\t\tIdGenerator(int max)\n> +\t\tIdGenerator(unsigned int max)\n> \t\t\t: max_(max), id_(0)\n> \t\t{\n> \t\t}\n> \n> -\t\tint get()\n> +\t\tunsigned int get()\n> \t\t{\n> -\t\t\tint id;\n> +\t\t\tunsigned int id;\n> \t\t\tif (!recycle_.empty()) {\n> \t\t\t\tid = recycle_.front();\n> \t\t\t\trecycle_.pop();\n> \t\t\t} else {\n> -\t\t\t\tid = id_++;\n> +\t\t\t\tid = ++id_;\n> \t\t\t\tASSERT(id_ <= max_);\n> \t\t\t}\n> \t\t\treturn id;\n> \t\t}\n> \n> -\t\tvoid release(int id)\n> +\t\tvoid release(unsigned int id)\n> \t\t{\n> \t\t\trecycle_.push(id);\n> \t\t}\n> @@ -104,9 +104,9 @@ private:\n> \t\t}\n> \n> \tprivate:\n> -\t\tint max_;\n> -\t\tint id_;\n> -\t\tstd::queue recycle_;\n> +\t\tunsigned int max_;\n> +\t\tunsigned int id_;\n> +\t\tstd::queue recycle_;\n> \t};\n> \n> \tvoid clearBuffers();\n> diff --git a/src/libcamera/pipeline/rpi/vc4/raspberrypi.cpp b/src/libcamera/pipeline/rpi/vc4/raspberrypi.cpp\n> index cfde7f2e2229..e54bf1ef2c17 100644\n> --- a/src/libcamera/pipeline/rpi/vc4/raspberrypi.cpp\n> +++ b/src/libcamera/pipeline/rpi/vc4/raspberrypi.cpp\n> @@ -1210,7 +1210,7 @@ int PipelineHandlerRPi::queueRequestDevice(Camera *camera, Request *request)\n> \t\t\tcontinue;\n> \n> \t\tFrameBuffer *buffer = request->findBuffer(stream);\n> -\t\tif (buffer && stream->getBufferId(buffer) == -1) {\n> +\t\tif (buffer && !stream->getBufferId(buffer)) {\n> \t\t\t/*\n> \t\t\t * This buffer is not recognised, so it must have been allocated\n> \t\t\t * outside the v4l2 device. Store it in the stream buffer list\n> @@ -2042,7 +2042,7 @@ void RPiCameraData::unicamBufferDequeue(FrameBuffer *buffer)\n> \n> \tfor (RPi::Stream &s : unicam_) {\n> \t\tindex = s.getBufferId(buffer);\n> -\t\tif (index != -1) {\n> +\t\tif (index) {\n> \t\t\tstream = &s;\n> \t\t\tbreak;\n> \t\t}\n> @@ -2098,7 +2098,7 @@ void RPiCameraData::ispOutputDequeue(FrameBuffer *buffer)\n> \n> \tfor (RPi::Stream &s : isp_) {\n> \t\tindex = s.getBufferId(buffer);\n> -\t\tif (index != -1) {\n> +\t\tif (index) {\n> \t\t\tstream = &s;\n> \t\t\tbreak;\n> \t\t}","headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 9EAFAC0DA4\n\tfor ;\n\tThu, 27 Apr 2023 13:18:29 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id C47C4627DF;\n\tThu, 27 Apr 2023 15:18:28 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 66CCE627B7\n\tfor ;\n\tThu, 27 Apr 2023 15:18:26 +0200 (CEST)","from pendragon.ideasonboard.com\n\t(133-32-181-51.west.xps.vectant.ne.jp [133.32.181.51])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 451E19DE;\n\tThu, 27 Apr 2023 15:18:13 +0200 (CEST)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1682601508;\n\tbh=CIPiF6l32QT9KdeWBgB/5a0AnVITJggZK7ZaXoPjyIk=;\n\th=Date:To:References:In-Reply-To:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc:\n\tFrom;\n\tb=G92tr79vYMRUGMH82wXTmacDm+gV18HvS23qYZNMIqaq0jO9/HvmFVuJmRBoP4fRY\n\t3IE8VYgVNrZ5BEwdD6dALTtglX5gK95Oy8LhgIOHu1t7F/6FEyVQpk/G5DoAik1uhZ\n\tDcj88ahjBQulUosSwjch7vHXUSs+sGJ/tH7Oz9bqK/0SpGPZfHg5Df1TalM1tazB9d\n\tmaL14k+AlU+VaVMvkvFdKxJ0V/8McLGqEO7rdcDSW3rJZGoEPfawPRMdlVgLsILzaq\n\thI/51iYdPC+XCFv4B/AMKCrME/uXEznJAAYfqWmm6ywkLDNfRk9uupZBxZvkQWAW8d\n\tH0o9Vso9cq2mA==","v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1682601494;\n\tbh=CIPiF6l32QT9KdeWBgB/5a0AnVITJggZK7ZaXoPjyIk=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=Jsh5x8YYz4Fh9BxfgF0bCUHAnMkDCPB/WzqhVPBOcX5c1GsoQDS45UYOv1FogWo5A\n\t2qKT/BzIK01Vt6OY45JX1veH+Y6Hu/f/2OkNQEGOgaERdzdHuK15cbG2o8GUp8snJO\n\tchfqXgjQrz9zezXbH4izmUimLMvpLiGQSf8Ylapg="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"Jsh5x8YY\"; dkim-atps=neutral","Date":"Thu, 27 Apr 2023 16:18:37 +0300","To":"Naushir Patuck ","Message-ID":"<20230427131837.GB26786@pendragon.ideasonboard.com>","References":"<20230426131057.21550-1-naush@raspberrypi.com>\n\t<20230426131057.21550-6-naush@raspberrypi.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Disposition":"inline","In-Reply-To":"<20230426131057.21550-6-naush@raspberrypi.com>","Subject":"Re: [libcamera-devel] [PATCH 05/13] pipeline: raspberrypi:\n\trpi_stream: Set invalid buffer to id == 0","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","From":"Laurent Pinchart via libcamera-devel\n\t","Reply-To":"Laurent Pinchart ","Cc":"libcamera-devel@lists.libcamera.org","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]