From patchwork Mon Jul 13 08:47:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Naushir Patuck X-Patchwork-Id: 8755 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 EF3E8BD790 for ; Mon, 13 Jul 2020 08:48:05 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id BBA126055F; Mon, 13 Jul 2020 10:48:05 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="dLhfHdn/"; dkim-atps=neutral Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [IPv6:2a00:1450:4864:20::32e]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 23075605C2 for ; Mon, 13 Jul 2020 10:48:03 +0200 (CEST) Received: by mail-wm1-x32e.google.com with SMTP id 22so12491504wmg.1 for ; Mon, 13 Jul 2020 01:48:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=XqHsiNLBAY2ZmnuKeHpy0MW/ly4AmD1Jxn/qN65J8x8=; b=dLhfHdn/MrkyueYAD2ydUhhIFDcagtqZLEnkDQOolzhHh3+vd/LHX33BaVp3snQc96 MCa0rT1TijVZmIzxaiufRYobpNwSxnXPjHEdYRhdaIVwOBI2V8M77W1MoUWi4lNJ+SXr ZJyL5ZC4vl6ufUYktkUqMikLbImXl4OHyYdBGUAR9YUR65VRi8Cms10UjrlqKs3OV2me OvDHl1IWaFw6jhgbGX0zGJMsgveoGS+rmOb8ke1gPl98blEjcSnyWNHTnjnMBZEL2M7d mYJZi9pQSGwdNs5VJpS+5xN3YD+x4j/PQkQRMuEyQ7UrZJrm97Yr8tkFwSeiuDQ4siaQ YgmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=XqHsiNLBAY2ZmnuKeHpy0MW/ly4AmD1Jxn/qN65J8x8=; b=QxucBJRa57xFmOXT7hvpoNJSIuTj0aZ4ql49z1JzkuiU7D5grLna5semQocqhuWYWQ kpvPXyO9xW9ZFSbxRw31/GAafoHE1WBFYvwbgjKkBuXAILigxFUUyAkQW1/wfR06zn3N 0l1zJ0UBKELiLAhAdChXzHrIVdM53osOAhvpLhAH0NvTeTDpZ6cE/58Ir7PWAWtURu0Y 2YvVPGhhHS1Fcsefz8NsswMAFCgrpuusgAJ1UG11xcFNZuh00YVFxkHfBum6LpwYWyap wqtEtn0gjyCNjVgUkpr/Di2zwIbCQIs0+iovTyrvHUDBtusqwEnMLPmO6X6/rBLeCu7V aNTA== X-Gm-Message-State: AOAM530cvJbvSwzJIH3jI0PdfdVmF/4tygTLgsxJitA/isFQMqkvZHf6 O4FtnPkkz/2ez7uz2rStUy+4Ng4XWxM= X-Google-Smtp-Source: ABdhPJwfyr+7+vTejQ6MLw3KlDnD87XN3B1JxSqGUAt1KUORs78gqOZiHtb9GeMtW8wVZ84oOOG5Og== X-Received: by 2002:a05:600c:218f:: with SMTP id e15mr16636207wme.63.1594630082474; Mon, 13 Jul 2020 01:48:02 -0700 (PDT) Received: from naushir-VirtualBox.patuck.local ([88.97.76.4]) by smtp.gmail.com with ESMTPSA id g14sm23203357wrm.93.2020.07.13.01.48.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jul 2020 01:48:01 -0700 (PDT) From: Naushir Patuck To: libcamera-devel@lists.libcamera.org Date: Mon, 13 Jul 2020 09:47:24 +0100 Message-Id: <20200713084727.232422-6-naush@raspberrypi.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200713084727.232422-1-naush@raspberrypi.com> References: <20200713084727.232422-1-naush@raspberrypi.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 5/9] libcamera: pipeline: raspberrypi: Remove const qualifier from RPiStream 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" For the zero-copy RAW capture feature, the RPiStream will have to be modified. Remove the const qualifier in anticipation of the future commits for this feature. Signed-off-by: Naushir Patuck Reviewed-by: Niklas Söderlund --- src/libcamera/pipeline/raspberrypi/raspberrypi.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp index a613ce65..2f4255a4 100644 --- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp +++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp @@ -163,7 +163,7 @@ public: void ispOutputDequeue(FrameBuffer *buffer); void clearIncompleteRequests(); - void handleStreamBuffer(FrameBuffer *buffer, const RPi::RPiStream *stream); + void handleStreamBuffer(FrameBuffer *buffer, RPi::RPiStream *stream); void handleState(); CameraSensor *sensor_; @@ -1120,12 +1120,12 @@ done: void RPiCameraData::unicamBufferDequeue(FrameBuffer *buffer) { - const RPi::RPiStream *stream = nullptr; + RPi::RPiStream *stream = nullptr; if (state_ == State::Stopped) return; - for (RPi::RPiStream const &s : unicam_) { + for (RPi::RPiStream &s : unicam_) { if (s.findFrameBuffer(buffer)) { stream = &s; break; @@ -1186,12 +1186,12 @@ void RPiCameraData::ispInputDequeue(FrameBuffer *buffer) void RPiCameraData::ispOutputDequeue(FrameBuffer *buffer) { - const RPi::RPiStream *stream = nullptr; + RPi::RPiStream *stream = nullptr; if (state_ == State::Stopped) return; - for (RPi::RPiStream const &s : isp_) { + for (RPi::RPiStream &s : isp_) { if (s.findFrameBuffer(buffer)) { stream = &s; break; @@ -1272,7 +1272,7 @@ void RPiCameraData::clearIncompleteRequests() } } -void RPiCameraData::handleStreamBuffer(FrameBuffer *buffer, const RPi::RPiStream *stream) +void RPiCameraData::handleStreamBuffer(FrameBuffer *buffer, RPi::RPiStream *stream) { if (stream->isExternal()) { if (!dropFrameCount_) {