From patchwork Fri Jul 17 08:54: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: 8843 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 A118EC0109 for ; Fri, 17 Jul 2020 08:54:24 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 6D5E860546; Fri, 17 Jul 2020 10:54: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="ZD0wpdhb"; 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 2BC2C6053B for ; Fri, 17 Jul 2020 10:54:20 +0200 (CEST) Received: by mail-wr1-x42a.google.com with SMTP id z15so10142816wrl.8 for ; Fri, 17 Jul 2020 01:54:20 -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=Tdh1WQNfL/rgxBl0g9CSC/ICD3ZSxZ6i1j3jpF6dEvQ=; b=ZD0wpdhbGQ1JGB7TS5dDRIgLI78jR7QIuerxgEUx2t0Y8ykSGSWdREgPdrFmOwUQPG t7fQq6PrK+XKy1AEjFJ5wk7hnifHlYu+Z7iI6tKv/mBlj8hQjplHffh5hpSvijXstcLM H2q+SwYz3xX72we6pW+rbc2wl5O27YPJfpYOkO4acB0s5+Ij2Xrl/psO76586Ews+rR4 SqvvMSObbFsd3FTCg2Ag9uObcHwV4+4FqiDGiGUpKSht72QmBH03OQX1lsISowsM7Hu3 Twxq8OInKIN0nK2+q2uCby3+VXB9f0XCT3yh9wFkJEh7Y30qCTuJMSTecbcHBpVJ4SO7 Mhwg== 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=Tdh1WQNfL/rgxBl0g9CSC/ICD3ZSxZ6i1j3jpF6dEvQ=; b=s2WS0yNuXqFNhfUXD09Xr6yA2rKYsKiD4rARfAyK1HR5TW12pUMXEUMkSy0Jutifp0 YHlEvDsxOYlNHiDdUP048czeufgIeCfZsgHeU4+/E8/AxraF0J18L1kxSYramg9zRk+V a/gi5K4Y+zY0IOB8pghXNQU4n8/eKzh6WCV2efwz6C0utgXeC5LOfBgzFKcK5GH652hB 4H7jlAU/gYpRUywHHct7OmneKjzCy3fhbDTPCeTO3CCEagR+kueAHCbEE0TjVNjm8MRA fl0h/+X2qiuXzH8RKy81Y5BqhZdcfBJukJ+49rn3B+GCbv82XlM4sxnBIOmUmGhftXHr 5dTw== X-Gm-Message-State: AOAM531315uRcFzlPuXFKcC25P+mSPzOl6+q5ijyzJVErnXYYBH+sSNw LkgLz2Q1pva6GiWpjSWrpY+vxHhoYgI= X-Google-Smtp-Source: ABdhPJxseFHz8hzIOo3WDNzQZyHejlcbqg0QY1Zmr39o5WAXFReTA4acc/aKoPv3xkovAF/kW5QNVA== X-Received: by 2002:adf:f54d:: with SMTP id j13mr8834197wrp.427.1594976059634; Fri, 17 Jul 2020 01:54:19 -0700 (PDT) Received: from naushir-VirtualBox.patuck.local ([88.97.76.4]) by smtp.gmail.com with ESMTPSA id 92sm14582375wrr.96.2020.07.17.01.54.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jul 2020 01:54:18 -0700 (PDT) From: Naushir Patuck To: libcamera-devel@lists.libcamera.org Date: Fri, 17 Jul 2020 09:54:05 +0100 Message-Id: <20200717085410.732308-6-naush@raspberrypi.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200717085410.732308-1-naush@raspberrypi.com> References: <20200717085410.732308-1-naush@raspberrypi.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v3 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 c324efc1..ca8434a3 100644 --- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp +++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp @@ -162,7 +162,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_; @@ -1128,12 +1128,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; @@ -1194,12 +1194,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; @@ -1280,7 +1280,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_) {