From patchwork Mon Jul 20 09:13:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Naushir Patuck X-Patchwork-Id: 8867 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 9B45EBD792 for ; Mon, 20 Jul 2020 09:13:34 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 4A617605B2; Mon, 20 Jul 2020 11:13:34 +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="HC8r2PZZ"; dkim-atps=neutral Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [IPv6:2a00:1450:4864:20::32f]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 12093605BB for ; Mon, 20 Jul 2020 11:13:32 +0200 (CEST) Received: by mail-wm1-x32f.google.com with SMTP id 17so24394775wmo.1 for ; Mon, 20 Jul 2020 02:13:32 -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=mlnlsKaKP2HEw7g4p82W82aRH/V0hITuA/ZGL2qH+mQ=; b=HC8r2PZZyjvzHjdYfqMEWR+IlZjy8pAerCNwpwhfBLjadxiodLBymR2CXJ4xUHf+q9 gz4b4IggV0/HUznX2/ZV7xXaPus2HVywCZM6g3FDxkLB0fSxprPOgtlJfGHAUVxWl+VQ sfUEkrgWgy/J3ZT62YIwmWtA330u3IJluI0DmdblqmCutZOPzls23fAUW/Stm1jhzngR g1gboEXVLl2PlAgYt0j0JUoGEoR+ItWy32etkk+6vvxxeHemdbNcDL8d5Xfxh5FE6ksV H3ekQMoLZo4lMzojeOQ7EGiFZRdT6rCXz/ECAD8gSdeKjhQj6WnI5+fm3NYA1BpcQbq7 YuSQ== 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=mlnlsKaKP2HEw7g4p82W82aRH/V0hITuA/ZGL2qH+mQ=; b=Mb+o0Q/YATYYi5Bm0xK1Srq2siNC5jCHLBANi4S9yQyRUaXhODepSlhFyroExoWVFG UJHhAfW3WnGw8hxGNzkuMxGyZ+sPbCzXEfaDr8Nl0SYnrRPVVcHldjvff2mecD9uZPYW rlYdXWcbAJLu3zez7WYjOIzBBhYh7851Ny+CpGxa4zIHafH6M0b9gmiQV/cTsudMMoOQ Yc4sNf1xYlEGeVnbW3AFddgjx59QGWYCMLECNo6t08O9RCvaQCuG0JZioneL5yjxv5ga caADZfCLcMR0oJ7Eoru6MtwLNRWyLt+bDCF4dhcc1+LhgNKVYaQmKG3DSsSfRKLP1RmL xMIA== X-Gm-Message-State: AOAM531AcPTqvRxdFz4oUXOsy9HDcDoBcwsN+yz7oPBlEotisfgOwWa9 ak0NJH2OKMEgNbYQj01bMddV1kKotxybdw== X-Google-Smtp-Source: ABdhPJzET71JUjMTHS1JHY5Nfvafj7xyfFQcq1HvqRloHYQedmaTniNGNMu9ySIBUBVW6c+Ev1611A== X-Received: by 2002:a1c:f219:: with SMTP id s25mr19938168wmc.2.1595236411517; Mon, 20 Jul 2020 02:13:31 -0700 (PDT) Received: from naushir-VirtualBox.patuck.local ([88.97.76.4]) by smtp.gmail.com with ESMTPSA id u1sm38137185wrb.78.2020.07.20.02.13.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jul 2020 02:13:30 -0700 (PDT) From: Naushir Patuck To: libcamera-devel@lists.libcamera.org Date: Mon, 20 Jul 2020 10:13:07 +0100 Message-Id: <20200720091311.805092-6-naush@raspberrypi.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200720091311.805092-1-naush@raspberrypi.com> References: <20200720091311.805092-1-naush@raspberrypi.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v4 5/9] 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 --- 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 486345fa..8f6a999b 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_) {