From patchwork Mon Mar 21 10:27:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Naushir Patuck X-Patchwork-Id: 15487 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 1954CBD80A for ; Mon, 21 Mar 2022 10:27:14 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id C81DD632E2; Mon, 21 Mar 2022 11:27:13 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org; s=mail; t=1647858433; bh=7NJoJpsjqQ7kNIZM1leTOmokHIm6yQ5mTBCrreBgu0I=; h=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=vTiE+AgIAAv+/F1TrtjCgS7yQuj86S00ADF6WlyXrIJzmHT5ajNksxnTLtBNcVwJi EiFgH9A7oJYEsVRH88Otw6TYOZgeTqAjMHtDDg/5KEVvwzThU4Bso0TnmlALo82BVW Vc1Mtg8hHeZPxL6bCg45je1j8ZHg4kWO4Mt0MwTl3XfSAUI5072aRjg5BNX27Cyh4j kbaLWMpePIqkvzl41r92VtItMS8d/O2nJzqoBfpTKuPtPNHbOZh2+8k5cxy4VGQZ6h /TCClJgK9doOZuZMeaYDiszX/rbQxr9VSdsXETaHBC/4Oozf2brqcJa3HkuAK3CE5s Mx1S8ZVLy7oPA== 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 84A04610F8 for ; Mon, 21 Mar 2022 11:27:08 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=pass (2048-bit key; unprotected) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="mR9MZ1sM"; dkim-atps=neutral Received: by mail-wm1-x32f.google.com with SMTP id bi13-20020a05600c3d8d00b0038c2c33d8f3so7382325wmb.4 for ; Mon, 21 Mar 2022 03:27:08 -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=RughUZPLJCp5nFwjdB+7SjIyn+ztq4xtc1EQkx+ClCE=; b=mR9MZ1sMpIKynJzQFSmVpqwS8XPhHFxuKLA1KqLZkchCVrKrkibeDVbeRQVunt4mpB ElWEZcW5XmbeOku9zUXq1DIkKYq1R+tVrOIroBBVHZ0W/nsC7eEgjVzhJuz7+uqONGnG gFcYEr7Y93LybqBNt51dgg1Y4s4mPZUhFkpLynSjEoM+9KQubnD4KZOy4MnEM8L9cu4l T2w/7n10yO3PdbycjWbW7oK5zpLWBXoUOinX1sb8fHG55urhuCsFDmtIsJta9MToN6WK G+jRuHnCp+EmyEU9tpRSo7Q4tH0NWySenSWp21DpDrY8oNPfqkwj7j3doo3BZe4ix/W4 GzHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=RughUZPLJCp5nFwjdB+7SjIyn+ztq4xtc1EQkx+ClCE=; b=MdFbgn4PPFvVWPh2C7Ay8kHq3DoDuVoBb63DE4s5Zot8IA86XuEkt7HM3hrCmr0EeQ d0qPbnFhAjsn0yGpleLfgBwTj0v/tBJ07eVFxImFk4fcd4V8/qDKWq2Kyfksg7MjBzIk /AYsA7SmRXrYZ2Mj6tDvARJLW05RPdkscVR3fNhhrmG285SWdntKtfCH3i7f+IiFb/vw Zajb81sm59B35rt2gs9vYMPkxGIw6sjDUST+8XUQkwAB8QYxYDmdEVGUG2g+x5E/mxkn 2TjMh9L/Jv3C+qJ/3F+y2Rr1fcWJ0XFdG2Ly2lh6hlWcNVqwf+Jige96UgvXOPLvxv10 DqNw== X-Gm-Message-State: AOAM530BAf4VV15g5tSaWsZTSnqqqDbqphm20mUrDlGA3+8OUE0YtGFP nsj+UlJJTd2Gl/eNSOTjswEM08SveQd96Q== X-Google-Smtp-Source: ABdhPJw9pM4CRdwJjOQJxGRB17JLdB6dd7Tk48GuKGq9lk+gCmN4U3aF1wJdQ23W62xbPHGVo6KUPg== X-Received: by 2002:a7b:cb46:0:b0:37b:dd79:e1c4 with SMTP id v6-20020a7bcb46000000b0037bdd79e1c4mr18940305wmj.39.1647858427964; Mon, 21 Mar 2022 03:27:07 -0700 (PDT) Received: from naush-laptop.pitowers.org ([2a00:1098:3142:14:77bd:7c6c:a8b9:8855]) by smtp.gmail.com with ESMTPSA id v10-20020a056000144a00b00203df06cf9bsm13530115wrx.106.2022.03.21.03.27.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Mar 2022 03:27:07 -0700 (PDT) To: libcamera-devel@lists.libcamera.org Date: Mon, 21 Mar 2022 10:27:01 +0000 Message-Id: <20220321102702.1753800-5-naush@raspberrypi.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220321102702.1753800-1-naush@raspberrypi.com> References: <20220321102702.1753800-1-naush@raspberrypi.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v3 4/5] pipeline: raspberrypi: Repurpose RPi::Stream::reset() 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: , X-Patchwork-Original-From: Naushir Patuck via libcamera-devel From: Naushir Patuck Reply-To: Naushir Patuck Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" The original use of RPi::Stream::reset() was to clear the external flag state and free/clear out the framebuffers for the stream. However, the latter is now done through PipelineHandlerRPi::configure(). Rework PipelineHandlerRPi::configure() to call RPi::Stream::setExternal() instead of RPi::Stream::reset() to achieve the same thing. Repurpose RPi::Stream::reset() to instead reset the state of the buffer handling logic, where all internally allocated buffers are put back into the queue of available buffers. As such, rename the function to RPi::Stream::resetbuffers() This resetbuffers() is now called from PipelineHandlerRPi::start(), allowing the pipeline handler to correctly deal with start()/stop()/start() sequences and reusing the buffers allocated on the first start(). Signed-off-by: Naushir Patuck Reviewed-by: David Plowman Tested-by: David Plowman Reviewed-by: Kieran Bingham --- src/libcamera/pipeline/raspberrypi/raspberrypi.cpp | 7 +++++-- src/libcamera/pipeline/raspberrypi/rpi_stream.cpp | 13 ++++++------- src/libcamera/pipeline/raspberrypi/rpi_stream.h | 2 +- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp index 92043962494b..0ff6acdceb66 100644 --- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp +++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp @@ -693,7 +693,7 @@ int PipelineHandlerRPi::configure(Camera *camera, CameraConfiguration *config) /* Start by freeing all buffers and reset the Unicam and ISP stream states. */ data->freeBuffers(); for (auto const stream : data->streams_) - stream->reset(); + stream->setExternal(false); BayerFormat::Packing packing = BayerFormat::Packing::CSI2; Size maxSize, sensorSize; @@ -991,6 +991,9 @@ int PipelineHandlerRPi::start(Camera *camera, const ControlList *controls) RPiCameraData *data = cameraData(camera); int ret; + for (auto const stream : data->streams_) + stream->resetBuffers(); + if (!data->buffersAllocated_) { /* Allocate buffers for internal pipeline usage. */ ret = prepareBuffers(camera); @@ -1031,7 +1034,7 @@ int PipelineHandlerRPi::start(Camera *camera, const ControlList *controls) data->unicam_[Unicam::Image].dev()->setFrameStartEnabled(true); /* - * Reset the delayed controls with the gain and exposure values set by + * resetBuffers the delayed controls with the gain and exposure values set by * the IPA. */ data->delayedCtrls_->reset(); diff --git a/src/libcamera/pipeline/raspberrypi/rpi_stream.cpp b/src/libcamera/pipeline/raspberrypi/rpi_stream.cpp index f446e1ce66c7..7a93efaa29da 100644 --- a/src/libcamera/pipeline/raspberrypi/rpi_stream.cpp +++ b/src/libcamera/pipeline/raspberrypi/rpi_stream.cpp @@ -26,10 +26,12 @@ std::string Stream::name() const return name_; } -void Stream::reset() +void Stream::resetBuffers() { - external_ = false; - clearBuffers(); + /* Add all internal buffers to the queue of usable buffers. */ + availableBuffers_ = {}; + for (auto const &buffer : internalBuffers_) + availableBuffers_.push(buffer.get()); } void Stream::setExternal(bool external) @@ -97,10 +99,7 @@ int Stream::prepareBuffers(unsigned int count) /* Add these exported buffers to the internal/external buffer list. */ setExportedBuffers(&internalBuffers_); - - /* Add these buffers to the queue of internal usable buffers. */ - for (auto const &buffer : internalBuffers_) - availableBuffers_.push(buffer.get()); + resetBuffers(); } /* We must import all internal/external exported buffers. */ diff --git a/src/libcamera/pipeline/raspberrypi/rpi_stream.h b/src/libcamera/pipeline/raspberrypi/rpi_stream.h index d6f49d34f8c8..c37f7e82eef6 100644 --- a/src/libcamera/pipeline/raspberrypi/rpi_stream.h +++ b/src/libcamera/pipeline/raspberrypi/rpi_stream.h @@ -45,7 +45,7 @@ public: V4L2VideoDevice *dev() const; std::string name() const; bool isImporter() const; - void reset(); + void resetBuffers(); void setExternal(bool external); bool isExternal() const;