From patchwork Fri Oct 16 09:00:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 10083 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id EA8EFBDB1F for ; Fri, 16 Oct 2020 09:00:27 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id B8A8261102; Fri, 16 Oct 2020 11:00:27 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="SAHHssCe"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id EA86160532 for ; Fri, 16 Oct 2020 11:00:20 +0200 (CEST) Received: from Q.local (cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 82338528; Fri, 16 Oct 2020 11:00:20 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1602838820; bh=p8OVJy2+spdtsu3tlRc3jASGz2jYQOq37XEfR3jGRg4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SAHHssCeMGN7560tT7hI/kQhahBO+iGZgD/O4WgEJBe72hAXo3gQ+rP7mDunVkvql 224f3uF8iRHli0y2s8OoICZFY4qdUCTk4T/dY6mMXZqFlxBS3r7190DkqQLQ4hSEbe xKFxgBtUiez4VwABjWYCy44GFHDqXR+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: Explicitly name requestBuffer X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" The FrameBuffer used to track any addition to the request in an under-run event was shadowed against the returned buffer, being placed back on the availableBuffers_ queue. Rename the shadowed variable to be more explicit that it is a separate Buffer. Signed-off-by: Kieran Bingham Reviewed-by: Niklas Söderlund --- src/libcamera/pipeline/raspberrypi/rpi_stream.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libcamera/pipeline/raspberrypi/rpi_stream.cpp b/src/libcamera/pipeline/raspberrypi/rpi_stream.cpp index 1a42cc17bcba..3a5dadab81e0 100644 --- a/src/libcamera/pipeline/raspberrypi/rpi_stream.cpp +++ b/src/libcamera/pipeline/raspberrypi/rpi_stream.cpp @@ -163,9 +163,9 @@ void Stream::returnBuffer(FrameBuffer *buffer) * If so, do it now as availableBuffers_ will not be empty. */ while (!requestBuffers_.empty()) { - FrameBuffer *buffer = requestBuffers_.front(); + FrameBuffer *requestBuffer = requestBuffers_.front(); - if (!buffer) { + if (!requestBuffer) { /* * We want to queue an internal buffer, but none * are available. Can't do anything, quit the loop. @@ -177,12 +177,12 @@ void Stream::returnBuffer(FrameBuffer *buffer) * We want to queue an internal buffer, and at least one * is available. */ - buffer = availableBuffers_.front(); + requestBuffer = availableBuffers_.front(); availableBuffers_.pop(); } requestBuffers_.pop(); - queueToDevice(buffer); + queueToDevice(requestBuffer); } }