{"id":10079,"url":"https://patchwork.libcamera.org/api/patches/10079/?format=json","web_url":"https://patchwork.libcamera.org/patch/10079/","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-3-kieran.bingham@ideasonboard.com>","date":"2020-10-16T09:00:05","name":"[libcamera-devel,v3,02/11] qcam: main_window: Explicitly name raw buffer","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"c245f722cd646060eb0b4846022368a700cf4601","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/10079/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/10079/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/10079/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 A7FD5BDB1F\n\tfor ;\n\tFri, 16 Oct 2020 09:00:23 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 6F7FB610F4;\n\tFri, 16 Oct 2020 11:00:23 +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 71B3B61027\n\tfor ;\n\tFri, 16 Oct 2020 11:00:19 +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 E755B528;\n\tFri, 16 Oct 2020 11:00:18 +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=\"iGKPOW4C\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1602838819;\n\tbh=axY2+nnMEqGsTzikd4CtJMBYSTip7WI2zR7Ef7Lhymo=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=iGKPOW4C6+fyQGD6IJOJC5mx9bmovoMyaH+N2VItdHBQWEVv8lDDd/DSPkouvuOel\n\tK3NNSfXHta9iyU+Ad+vNJohwTw0yhRZ/dGynCT9V/iLJI4DSsZvy8C/zZwyMAdcXqC\n\ttRR+TZ9/Yr/WN+L8g4VCX5b3JizgIGJ8NMb2rQoc=","From":"Kieran Bingham ","To":"libcamera devel ","Date":"Fri, 16 Oct 2020 10:00:05 +0100","Message-Id":"<20201016090014.64703-3-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 02/11] qcam: main_window: Explicitly\n\tname raw buffer","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 buffer obtained for queuing to a raw stream shadows the buffer\npassed in for the main view finder stream.\n\nPrevent shadowing, and explicitly name the buffer as a separate variable.\n\nSuggested-by: Niklas Söderlund \nSigned-off-by: Kieran Bingham \nReviewed-by: Niklas Söderlund \nReviewed-by: Laurent Pinchart \n---\n src/qcam/main_window.cpp | 8 ++++----\n 1 file changed, 4 insertions(+), 4 deletions(-)","diff":"diff --git a/src/qcam/main_window.cpp b/src/qcam/main_window.cpp\nindex 0cbdab9a6bce..f140313ede8d 100644\n--- a/src/qcam/main_window.cpp\n+++ b/src/qcam/main_window.cpp\n@@ -769,16 +769,16 @@ void MainWindow::queueRequest(FrameBuffer *buffer)\n \trequest->addBuffer(vfStream_, buffer);\n \n \tif (captureRaw_) {\n-\t\tFrameBuffer *buffer = nullptr;\n+\t\tFrameBuffer *rawBuffer = nullptr;\n \n \t\t{\n \t\t\tQMutexLocker locker(&mutex_);\n \t\t\tif (!freeBuffers_[rawStream_].isEmpty())\n-\t\t\t\tbuffer = freeBuffers_[rawStream_].dequeue();\n+\t\t\t\trawBuffer = freeBuffers_[rawStream_].dequeue();\n \t\t}\n \n-\t\tif (buffer) {\n-\t\t\trequest->addBuffer(rawStream_, buffer);\n+\t\tif (rawBuffer) {\n+\t\t\trequest->addBuffer(rawStream_, rawBuffer);\n \t\t\tcaptureRaw_ = false;\n \t\t} else {\n \t\t\tqWarning() << \"No free buffer available for RAW capture\";\n","prefixes":["libcamera-devel","v3","02/11"]}