From patchwork Tue Aug 4 09:58:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Naushir Patuck X-Patchwork-Id: 9170 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 23CC0BD87B for ; Tue, 4 Aug 2020 09:59:03 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id DDEB86054A; Tue, 4 Aug 2020 11:59:02 +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="l+ykXuL1"; dkim-atps=neutral Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [IPv6:2a00:1450:4864:20::42a]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 8E3B260499 for ; Tue, 4 Aug 2020 11:59:01 +0200 (CEST) Received: by mail-wr1-x42a.google.com with SMTP id f1so36250240wro.2 for ; Tue, 04 Aug 2020 02:59:01 -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=i6xPt6jLjmnkByxhoVw+shMv1UBgVkah1UXeWaWM0rU=; b=l+ykXuL1/iyJwk3vhd0SfXyTnWr+M9t6hgA4j+/e+XRIfhpErSJMkZ4MlhXuwqWwi6 KEtZiHUKblKa0KAtXU9lSpgCihDLVv7IJjD/locvVA9wq4iV6MZgq+dU5A3rnskXrbHG f0Q7gPLr2ENRA+IqMEj4m+yW4Zql/PWlop6Jw6XWUu5I0rbtOCneVWf5eSbzylrNyugF v5qlYYVW4PyfpQApk3zVXKkyyUOFJm6keEYVSHPRN65bnCbB1CZnLoTG61mXNL8iPiBE 3jAr0Xzsy6VEzQhadvkIpYDPL/uXzvND2yi0b7h5du7C0CmeLemU8p+PXjRz+ERhAMQE hU1A== 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=i6xPt6jLjmnkByxhoVw+shMv1UBgVkah1UXeWaWM0rU=; b=lUWxkHklHJF3frjiRrWj3QP9ExxIMUd6BL5SmIHb0WOyJ0+qY25/jlJObRDGGf9Xww ZOu837zYMvoL0mkFaGGJxoOa03UhlVrXOIuJ24+INWCrv/8nOmkoUk6hem0ppIozJvIQ Dxw/2hIWLi4RtjOfXEOvgOjaPh3O15tZL9QFq8ifsOE8hqT2F2gQHhWPTRc8FqOEu5Lg OhiD34ZyHqINl3dZCrDakz7arlgGiDZbtmV2DkcHTuuTuyz3aGsMgz42zFv0o2apZZpg NKLvT5ZLViaaV4x6qmXtaWDBrHJggOhhDk06f7Nwc2ocGdNiWM1u3co5EuVs0FNznOrH +OXQ== X-Gm-Message-State: AOAM532MpuIdMFnn17YfAFAyg+L9TvgO7F6bWQWJZCC/otoJ6O5HtmGe QbCAV5sZPLK7KxFGjUxNfN6HB6SyCO0Lnw== X-Google-Smtp-Source: ABdhPJz5+92fD7Bs6o95H446wE0i2dvJdWBonNUcHMBe35yh69oFfK+kGktNX+oGGChAJnfUfZy/EQ== X-Received: by 2002:adf:ea0c:: with SMTP id q12mr18183383wrm.382.1596535141090; Tue, 04 Aug 2020 02:59:01 -0700 (PDT) Received: from naushir-VirtualBox.patuck.local ([88.97.76.4]) by smtp.gmail.com with ESMTPSA id 32sm34047234wrh.18.2020.08.04.02.59.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Aug 2020 02:59:00 -0700 (PDT) From: Naushir Patuck To: libcamera-devel@lists.libcamera.org Date: Tue, 4 Aug 2020 10:58:43 +0100 Message-Id: <20200804095850.275499-6-naush@raspberrypi.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200804095850.275499-1-naush@raspberrypi.com> References: <20200804095850.275499-1-naush@raspberrypi.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v6 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 a6b87df1..53a07361 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_; @@ -1104,12 +1104,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; @@ -1170,12 +1170,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; @@ -1256,7 +1256,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_) {