From patchwork Tue Sep 8 07:49:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Naushir Patuck X-Patchwork-Id: 9521 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 CC582BDB1E for ; Tue, 8 Sep 2020 07:49:24 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 988CA62C08; Tue, 8 Sep 2020 09:49:24 +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="T15ngFA2"; dkim-atps=neutral Received: from mail-wr1-x434.google.com (mail-wr1-x434.google.com [IPv6:2a00:1450:4864:20::434]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id D5E0160534 for ; Tue, 8 Sep 2020 09:49:23 +0200 (CEST) Received: by mail-wr1-x434.google.com with SMTP id m6so18050422wrn.0 for ; Tue, 08 Sep 2020 00:49:23 -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=2HZNXIdwEKmIQyD2h2XM7I6cmzMuhwlSR4pJrDGbzE4=; b=T15ngFA24+SyNpSvFhubxpCqtiLU9sT0x2chP0sihXxfhepCxnatAvxG+UydojmFVT 2PfW9qDQtSsRJfuieqjwTy89+NrGFoVXzjFiV5WUNkrf/8nbaFwks5uQw0KeuI4WL37E COO+nUTLLOEtDys2hRIJf/k0pXqv32/xlcOzAgHl/hsHwKN9ayCp7ni+DWcbU4az6ofz 9DUFonwOB9BGESeY5dCc7TkCMgQVaumSC4Ali4ex6o4y4Y6PYZIj9PEZ0t3BSd0Nzntt Kg0Lz/ELLSbT7QAIhOvG4IdB3C56BIyK5iex3fdxgBM0G5H1EIwHk6IZBeeSps1mf6Ll FEUQ== 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=2HZNXIdwEKmIQyD2h2XM7I6cmzMuhwlSR4pJrDGbzE4=; b=pEKIBh4ifb2lcfoRKpY0vpLL0+wxbvQ5RC8CKcldsU72umyumLFjUHJRQnjMzhvrJj 9RVnz5Vosj8Vfjhb/P5Vjg/pdrsC08SNiP6hqdSLQ0YsMWUhivxUwvbZn0yZszq7zdsv 6JaY+7MV6ZTtEVnuXk9O2bAdCdYlT5Ox78iSghK26JFfp/I9oprl4PYRhCgRaSjC6aqh iH2o4qKbRugVqGdDp2F5OOaAAmktoLx1OaPQXpmDy7O2oij0aCRTKNG656sGaMbi1bNu oeACQpIumkxOODzuHven3fukGE0MC15+mZ8lLC9roWHsQT7Q4lyqxCDvCfC25HXgAcwW gcpg== X-Gm-Message-State: AOAM533ZdDVj6dazYsYixERWTaPr4NDZzsaQS3P2eXthX1+6VVoJa4mY Cs0lyDSztew9ImNR4NLjgNy11mULOk3toQ== X-Google-Smtp-Source: ABdhPJw3aBYsR8TJC9O6fT1fKVlyZV4krclR/Fn0yc0Y7UXMtz+hAmi1s5Hp5oZz3t/9KRw2R1VxXQ== X-Received: by 2002:a5d:6852:: with SMTP id o18mr24997882wrw.113.1599551363324; Tue, 08 Sep 2020 00:49:23 -0700 (PDT) Received: from naushir-VirtualBox.patuck.local ([88.97.76.4]) by smtp.gmail.com with ESMTPSA id q15sm32534502wrr.8.2020.09.08.00.49.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Sep 2020 00:49:22 -0700 (PDT) From: Naushir Patuck To: libcamera-devel@lists.libcamera.org Date: Tue, 8 Sep 2020 08:49:05 +0100 Message-Id: <20200908074913.109244-6-naush@raspberrypi.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200908074913.109244-1-naush@raspberrypi.com> References: <20200908074913.109244-1-naush@raspberrypi.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v7 05/12] 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 Reviewed-by: Kieran Bingham Reviewed-by: Laurent Pinchart Tested-by: David Plowman --- 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 ed83a2c6..6b9de029 100644 --- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp +++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp @@ -149,7 +149,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_; @@ -1107,12 +1107,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; @@ -1173,12 +1173,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; @@ -1259,7 +1259,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_) {