From patchwork Wed Jul 15 14:06:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Naushir Patuck X-Patchwork-Id: 8828 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 4BC36BD790 for ; Wed, 15 Jul 2020 14:07:21 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 180C16093A; Wed, 15 Jul 2020 16:07:21 +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="rP3jMW6i"; dkim-atps=neutral Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [IPv6:2a00:1450:4864:20::332]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 152BA6093A for ; Wed, 15 Jul 2020 16:07:19 +0200 (CEST) Received: by mail-wm1-x332.google.com with SMTP id j18so5744798wmi.3 for ; Wed, 15 Jul 2020 07:07:19 -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=NC23Yh0Jo9Xk9clV400Nvp3F4rLVrpwh1znNskXO+qY=; b=rP3jMW6i1C07YmcXRE+euAic5pps2SF+Uu661PAik0Ifdo9/kUOH2Dw/SidQJeOfGS vANVvN4wePi2NCApWrA0Ge/mgUzZ7bcQoopkHcy+04tHEV9bzZjrSAu1IppF8ltSZqAw vjH8yXsTijBSnzxTW4gpig/CNCx5rU8N8m9+abvEq9df0P+kDDLN4WevsOv8aQMN6hCM Od7g2/Fd7B96k1aRXZxMjeH4RD7QZzntnkS79SHQhg0MGwKSHQUxJwqaXmUotnpEQWOq Qw0yiZ4AptaA93++VeFfxSfy0L4cVfQm3OkzJij/+CNqyawUlbjweChDnccmsZ0iW7A4 V7VA== 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=NC23Yh0Jo9Xk9clV400Nvp3F4rLVrpwh1znNskXO+qY=; b=lkldCZ1Es62ccrFLU5RogWA0V7W/csvU3CyAfkX80xTYYmqsrS8fesvMR11XYAc//4 /rmtbOVgnasUKsTeURoRYpvIPXqJYjETRA15BN2cam1yonF9ahX4Pyi37qZIT3PUaEeA kjtsarEYlUY4WAMEd/z1jXDeXKqRAKOGH+ZE3xa4i8oAtDyAtH6W1nJK+CXgLIaYY1Qf yHBzMwLErzfFn/zazMHNssLdvshAqjG+Gy44elPcQU7WKJLyuq1BZVCfB0oGDqzjf60+ 9U9PIAVmzbUpqOHEmD4laXX1BxTyuAqgpIPcRNv3THPvJX1UX4+h2mp24p442nW1qCPE msww== X-Gm-Message-State: AOAM533GKo+bCWd32QFi2ZAR5jf17NSLde1W0fZaVGOeQyP2+bhtQvNb f8dPLG6IyEtb5PeMxhsVqB/HuC3WfbM= X-Google-Smtp-Source: ABdhPJxC+XnUt13GydW9lAm5uNGV+h6vriV9pnm9Ch51RWwOKWbWCzRnOofDzwydPuGJFZccb111Cw== X-Received: by 2002:a1c:a90d:: with SMTP id s13mr8466186wme.184.1594822037531; Wed, 15 Jul 2020 07:07:17 -0700 (PDT) Received: from naushir-VirtualBox.patuck.local ([88.97.76.4]) by smtp.gmail.com with ESMTPSA id l67sm4195339wml.13.2020.07.15.07.07.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jul 2020 07:07:15 -0700 (PDT) From: Naushir Patuck To: libcamera-devel@lists.libcamera.org Date: Wed, 15 Jul 2020 15:06:58 +0100 Message-Id: <20200715140703.566298-6-naush@raspberrypi.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200715140703.566298-1-naush@raspberrypi.com> References: <20200715140703.566298-1-naush@raspberrypi.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 05/10] 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_) {