{"id":10083,"url":"https://patchwork.libcamera.org/api/patches/10083/?format=json","web_url":"https://patchwork.libcamera.org/patch/10083/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20201016090014.64703-7-kieran.bingham@ideasonboard.com>","date":"2020-10-16T09:00:09","name":"[libcamera-devel,v3,06/11] libcamera: pipeline: rpi_stream: Explicitly name requestBuffer","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"af660763c3e85194bff081e418edce0a5cd10bf9","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/?format=json","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/10083/mbox/","series":[{"id":1379,"url":"https://patchwork.libcamera.org/api/series/1379/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1379","date":"2020-10-16T09:00:03","name":"Shadowed Variables","version":3,"mbox":"https://patchwork.libcamera.org/series/1379/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/10083/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/10083/checks/","tags":{},"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 EA8EFBDB1F\n\tfor ;\n\tFri, 16 Oct 2020 09:00:27 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id B8A8261102;\n\tFri, 16 Oct 2020 11:00:27 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id EA86160532\n\tfor ;\n\tFri, 16 Oct 2020 11:00:20 +0200 (CEST)","from Q.local (cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net\n\t[86.31.172.11])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 82338528;\n\tFri, 16 Oct 2020 11:00:20 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"SAHHssCe\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1602838820;\n\tbh=p8OVJy2+spdtsu3tlRc3jASGz2jYQOq37XEfR3jGRg4=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=SAHHssCeMGN7560tT7hI/kQhahBO+iGZgD/O4WgEJBe72hAXo3gQ+rP7mDunVkvql\n\t224f3uF8iRHli0y2s8OoICZFY4qdUCTk4T/dY6mMXZqFlxBS3r7190DkqQLQ4hSEbe\n\txKFxgBtUiez4VwABjWYCy44GFHDqXR+RY9bxrU90=","From":"Kieran Bingham ","To":"libcamera devel ","Date":"Fri, 16 Oct 2020 10:00:09 +0100","Message-Id":"<20201016090014.64703-7-kieran.bingham@ideasonboard.com>","X-Mailer":"git-send-email 2.25.1","In-Reply-To":"<20201016090014.64703-1-kieran.bingham@ideasonboard.com>","References":"<20201016090014.64703-1-kieran.bingham@ideasonboard.com>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v3 06/11] libcamera: pipeline: rpi_stream:\n\tExplicitly name requestBuffer","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","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"The FrameBuffer used to track any addition to the request in an\nunder-run event was shadowed against the returned buffer, being placed\nback on the availableBuffers_ queue.\n\nRename the shadowed variable to be more explicit that it is a separate\nBuffer.\n\nSigned-off-by: Kieran Bingham \nReviewed-by: Niklas Söderlund \n---\n src/libcamera/pipeline/raspberrypi/rpi_stream.cpp | 8 ++++----\n 1 file changed, 4 insertions(+), 4 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/raspberrypi/rpi_stream.cpp b/src/libcamera/pipeline/raspberrypi/rpi_stream.cpp\nindex 1a42cc17bcba..3a5dadab81e0 100644\n--- a/src/libcamera/pipeline/raspberrypi/rpi_stream.cpp\n+++ b/src/libcamera/pipeline/raspberrypi/rpi_stream.cpp\n@@ -163,9 +163,9 @@ void Stream::returnBuffer(FrameBuffer *buffer)\n \t * If so, do it now as availableBuffers_ will not be empty.\n \t */\n \twhile (!requestBuffers_.empty()) {\n-\t\tFrameBuffer *buffer = requestBuffers_.front();\n+\t\tFrameBuffer *requestBuffer = requestBuffers_.front();\n \n-\t\tif (!buffer) {\n+\t\tif (!requestBuffer) {\n \t\t\t/*\n \t\t\t * We want to queue an internal buffer, but none\n \t\t\t * are available. Can't do anything, quit the loop.\n@@ -177,12 +177,12 @@ void Stream::returnBuffer(FrameBuffer *buffer)\n \t\t\t * We want to queue an internal buffer, and at least one\n \t\t\t * is available.\n \t\t\t */\n-\t\t\tbuffer = availableBuffers_.front();\n+\t\t\trequestBuffer = availableBuffers_.front();\n \t\t\tavailableBuffers_.pop();\n \t\t}\n \n \t\trequestBuffers_.pop();\n-\t\tqueueToDevice(buffer);\n+\t\tqueueToDevice(requestBuffer);\n \t}\n }\n \n","prefixes":["libcamera-devel","v3","06/11"]}