From patchwork Fri Jul 24 07:22:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Naushir Patuck X-Patchwork-Id: 8950 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 A8FEDBD86F for ; Fri, 24 Jul 2020 07:22:58 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 4A4086117D; Fri, 24 Jul 2020 09:22:58 +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="Ft7S7ZqL"; dkim-atps=neutral Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [IPv6:2a00:1450:4864:20::32c]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 7CF12611B1 for ; Fri, 24 Jul 2020 09:22:54 +0200 (CEST) Received: by mail-wm1-x32c.google.com with SMTP id p14so6672478wmg.1 for ; Fri, 24 Jul 2020 00:22:54 -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=iEyyfA3+WNqQRC7R74q9CPRwheLMtJQvOOHm7j6/5qo=; b=Ft7S7ZqLHNwEu8nWNTbEsl8fG28OG3DrDReYCEn99swmuc3eEM9XLeUF8GpFovAyB3 7fKUpYP+FJz+RONwn4M+bNncd3X8TZU2OpDywEVOheni/G4w6Tkc/hgnibPcBkYmhuhh Ik4Ips62Ek7N1w1bBDxCEUGAuh4gk/3eb9Ybc2GAyuKXt4YWrdDzZFNojhSNn8HejsN1 ViRXck98jGYBZifNvuGaIvpp+ekx7wi9xSU6N7vjtXlgAQFv/cf7ZzU+0nxwzZ/nnAgB SIq102cBVGbobVM2YDlC7vRim9UIeKRRuvZN6LxEm+Fs50t9jFyrIRjHIqyEiOljAkWt 3UiQ== 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=iEyyfA3+WNqQRC7R74q9CPRwheLMtJQvOOHm7j6/5qo=; b=IPX/8NORtCVSQOtP4ybbD23p9VYvW1Cm4DLxiVvEPuU7DcoO6a2z58qZPFTD3RD931 2oT9ryshu8hX/77N1ZLl2J6HpMOAAv1HyX8Cu5C6CHHW36AvDgQls74e1GFgYy77z4g+ sLcpQ18HJxo1q8109wIu0GsMVM3ICbJEzN/NeE0YWMN9U/p9g3fDzZoGBAvE1V/wIQN8 0UoT+2JJ0TrdVXWxCo8NxHQt3OjsKDopF3AFEcUYbWfEe8NZ6Wef390sUucDYoTOspni /rRaBeaZwu06EkatsdQvQoategOm89V7O+tfR6s4cHPbcmWt5tzi9upguYbJd8rCp/CV cyqA== X-Gm-Message-State: AOAM531oDGeQ7kiVZGAsduRsVFHaxQRNAMfCnf4AZWNr5SFpR/UtQuW3 3uHkdYSg3y2+fXmlsTTrfZFTfxsTEM5Udw== X-Google-Smtp-Source: ABdhPJyvxs2EQs3evKx5vsKWCCZeNB7kgucIlbs68Xj6ak43bifpozh0AupTsm79MoTXBxmx9KXmMw== X-Received: by 2002:a7b:c205:: with SMTP id x5mr7953352wmi.161.1595575373900; Fri, 24 Jul 2020 00:22:53 -0700 (PDT) Received: from naushir-VirtualBox.patuck.local ([88.97.76.4]) by smtp.gmail.com with ESMTPSA id 32sm246595wrn.86.2020.07.24.00.22.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 00:22:53 -0700 (PDT) From: Naushir Patuck To: libcamera-devel@lists.libcamera.org Date: Fri, 24 Jul 2020 08:22:14 +0100 Message-Id: <20200724072218.943245-7-naush@raspberrypi.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200724072218.943245-1-naush@raspberrypi.com> References: <20200724072218.943245-1-naush@raspberrypi.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v5 06/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 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 31e15a45..e2afccc0 100644 --- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp +++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp @@ -150,7 +150,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_; @@ -1105,12 +1105,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; @@ -1171,12 +1171,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; @@ -1257,7 +1257,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_) {