From patchwork Fri Sep 18 09:42:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Naushir Patuck X-Patchwork-Id: 9650 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 66A02C3B5B for ; Fri, 18 Sep 2020 09:44:03 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 3592562FC8; Fri, 18 Sep 2020 11:44:03 +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="L8yE7iSU"; 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 C13EF62FBB for ; Fri, 18 Sep 2020 11:43:59 +0200 (CEST) Received: by mail-wr1-x434.google.com with SMTP id z1so4955094wrt.3 for ; Fri, 18 Sep 2020 02:43:59 -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=L8yE7iSUzPJQ5OtAfqY9b47MzNzzWAIZSYn4Jamm6Kof+lsKJeBdeegXM/f9McspB9 OL1o3PNo+NtcIy/9EdkzQHFbpFiWU/grn3ISVNu9FFKrp6z8U+lnsShT50K92YN28XSz gcGmLXRAfPnQom7UK2fCS7K3PHHv4HOOaWjXZKylXMByLfTulvPfhUQYOlzTPOd2NA/w lkFsWuS71C4nGoYGlYiimYiY/8RrivCAMux1/Y4I3nzuO9aoiQ0DA/isgeowE4z16NUI Zhy3o76AGZDSQAiXfcwzFhB8j0CphgrieoxhlvLrTHgpeqhXPQXIZssPfDZQr+sjvlSv ul3A== 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=ML4sTWtU8u7UwWBjbJF1rj6jhNHIsAoOEkR4pXV327bngOeXMsrV2ir9Evi9rVxMCW r04kJrMsscOWv1bjuyMY7VpvSHKlP4ykw+PDZktXSId4zDH8w1ayJ55btgliyB0deBXk 1pzqxJJ3RkvWhD58PLyoPa8h4epAobmWQToXNCtmCwwZKbfU7W2U8NAjFmq4IC20x77h IUBwaVcWdlmCLMHB4JfHQTCSK5hv/6UiOA98vHVwaRnZpGxF6vM/vMugbtOBTc0Tntbx NMy4vpCNP/s4W/VTfOj6Zp+UPvgJpg4DasAH6rSh42msiiUGxTeHEeOvMl90yWc9hWei SOHQ== X-Gm-Message-State: AOAM530konwvCN8bzyoOvh9bVTU4hFdRPAZz8TE0CRUliyrulizBwrvX ZF/4M0i3clfFcJGwaGXYUXq5Brbp5mAvGQ== X-Google-Smtp-Source: ABdhPJw79wJ3cxnuUoLgVYcaH5GeKUI/waIZGAzLsc7atSg5qHqnnZPyDeHhH0IJEqgD6YFEz2jdOQ== X-Received: by 2002:a5d:660f:: with SMTP id n15mr39653272wru.103.1600422239137; Fri, 18 Sep 2020 02:43:59 -0700 (PDT) Received: from naushir-VirtualBox.pitowers.org ([2a00:1098:3142:14:a00:27ff:fe4d:f6a2]) by smtp.gmail.com with ESMTPSA id n2sm4792472wma.29.2020.09.18.02.43.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Sep 2020 02:43:58 -0700 (PDT) From: Naushir Patuck To: libcamera-devel@lists.libcamera.org Date: Fri, 18 Sep 2020 10:42:26 +0100 Message-Id: <20200918094233.5273-6-naush@raspberrypi.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200918094233.5273-1-naush@raspberrypi.com> References: <20200918094233.5273-1-naush@raspberrypi.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v8 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_) {