{"id":10063,"url":"https://patchwork.libcamera.org/api/patches/10063/?format=json","web_url":"https://patchwork.libcamera.org/patch/10063/","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":"<20201015223750.58563-3-kieran.bingham@ideasonboard.com>","date":"2020-10-15T22:37:41","name":"[libcamera-devel,v2,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/10063/mbox/","series":[{"id":1376,"url":"https://patchwork.libcamera.org/api/series/1376/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1376","date":"2020-10-15T22:37:39","name":"Shadowed Variables","version":2,"mbox":"https://patchwork.libcamera.org/series/1376/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/10063/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/10063/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 A00ABBE905\n\tfor ;\n\tThu, 15 Oct 2020 22:38:00 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 51F7A610C4;\n\tFri, 16 Oct 2020 00:38:00 +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 199D5600F2\n\tfor ;\n\tFri, 16 Oct 2020 00:37:56 +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 999D811F0;\n\tFri, 16 Oct 2020 00:37:55 +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=\"Ro/AR5Xf\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1602801475;\n\tbh=eUl8J+hAKtxbT6JLkJ9Q6E9SpTEI1G2vXG+SIuUg2Bc=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=Ro/AR5XfP1Zc2KLbSaHVZhX35FU/ifs3WZ5Aj0ENMxJXc6sI//Vc7/z7a76W5h8+/\n\tdpQ31nqbbvd6fAOvZ4vSGgtG6sntaMUJEAj+95ESE9EYxjkRmCaXAj777C9CioWbaL\n\tEMie/vh4/ulw3Jt6j+jn8mv91z2/3MR5zsV1aEOw=","From":"Kieran Bingham ","To":"libcamera devel ","Date":"Thu, 15 Oct 2020 23:37:41 +0100","Message-Id":"<20201015223750.58563-3-kieran.bingham@ideasonboard.com>","X-Mailer":"git-send-email 2.25.1","In-Reply-To":"<20201015223750.58563-1-kieran.bingham@ideasonboard.com>","References":"<20201015223750.58563-1-kieran.bingham@ideasonboard.com>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v2 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 aliases the buffer\npassed in for the main view finder stream.\n\nPrevent aliasing, and explicitly name the buffer as a separate variable.\n\nSuggested-by: Niklas Söderlund \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","v2","02/11"]}