{"id":15487,"url":"https://patchwork.libcamera.org/api/patches/15487/?format=json","web_url":"https://patchwork.libcamera.org/patch/15487/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20220321102702.1753800-5-naush@raspberrypi.com>","date":"2022-03-21T10:27:01","name":"[libcamera-devel,v3,4/5] pipeline: raspberrypi: Repurpose RPi::Stream::reset()","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"fbf4f3d38498a894bf2f74fda369c80c24031029","submitter":{"id":34,"url":"https://patchwork.libcamera.org/api/people/34/?format=json","name":"Naushir Patuck","email":"naush@raspberrypi.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/15487/mbox/","series":[{"id":2977,"url":"https://patchwork.libcamera.org/api/series/2977/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2977","date":"2022-03-21T10:26:57","name":"Raspberry Pi: Efficient start/stop/start sequences","version":3,"mbox":"https://patchwork.libcamera.org/series/2977/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/15487/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/15487/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 1954CBD80A\n\tfor ;\n\tMon, 21 Mar 2022 10:27:14 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id C81DD632E2;\n\tMon, 21 Mar 2022 11:27:13 +0100 (CET)","from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com\n\t[IPv6:2a00:1450:4864:20::32f])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 84A04610F8\n\tfor ;\n\tMon, 21 Mar 2022 11:27:08 +0100 (CET)","by mail-wm1-x32f.google.com with SMTP id\n\tbi13-20020a05600c3d8d00b0038c2c33d8f3so7382325wmb.4\n\tfor ;\n\tMon, 21 Mar 2022 03:27:08 -0700 (PDT)","from naush-laptop.pitowers.org\n\t([2a00:1098:3142:14:77bd:7c6c:a8b9:8855])\n\tby smtp.gmail.com with ESMTPSA id\n\tv10-20020a056000144a00b00203df06cf9bsm13530115wrx.106.2022.03.21.03.27.07\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tMon, 21 Mar 2022 03:27:07 -0700 (PDT)"],"DKIM-Signature":["v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1647858433;\n\tbh=7NJoJpsjqQ7kNIZM1leTOmokHIm6yQ5mTBCrreBgu0I=;\n\th=To:Date:In-Reply-To:References:Subject:List-Id:List-Unsubscribe:\n\tList-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:\n\tFrom;\n\tb=vTiE+AgIAAv+/F1TrtjCgS7yQuj86S00ADF6WlyXrIJzmHT5ajNksxnTLtBNcVwJi\n\tEiFgH9A7oJYEsVRH88Otw6TYOZgeTqAjMHtDDg/5KEVvwzThU4Bso0TnmlALo82BVW\n\tVc1Mtg8hHeZPxL6bCg45je1j8ZHg4kWO4Mt0MwTl3XfSAUI5072aRjg5BNX27Cyh4j\n\tkbaLWMpePIqkvzl41r92VtItMS8d/O2nJzqoBfpTKuPtPNHbOZh2+8k5cxy4VGQZ6h\n\t/TCClJgK9doOZuZMeaYDiszX/rbQxr9VSdsXETaHBC/4Oozf2brqcJa3HkuAK3CE5s\n\tMx1S8ZVLy7oPA==","v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=raspberrypi.com; s=google;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references\n\t:mime-version:content-transfer-encoding;\n\tbh=RughUZPLJCp5nFwjdB+7SjIyn+ztq4xtc1EQkx+ClCE=;\n\tb=mR9MZ1sMpIKynJzQFSmVpqwS8XPhHFxuKLA1KqLZkchCVrKrkibeDVbeRQVunt4mpB\n\tElWEZcW5XmbeOku9zUXq1DIkKYq1R+tVrOIroBBVHZ0W/nsC7eEgjVzhJuz7+uqONGnG\n\tgFcYEr7Y93LybqBNt51dgg1Y4s4mPZUhFkpLynSjEoM+9KQubnD4KZOy4MnEM8L9cu4l\n\tT2w/7n10yO3PdbycjWbW7oK5zpLWBXoUOinX1sb8fHG55urhuCsFDmtIsJta9MToN6WK\n\tG+jRuHnCp+EmyEU9tpRSo7Q4tH0NWySenSWp21DpDrY8oNPfqkwj7j3doo3BZe4ix/W4\n\tGzHg=="],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (2048-bit key; \n\tunprotected) header.d=raspberrypi.com\n\theader.i=@raspberrypi.com\n\theader.b=\"mR9MZ1sM\"; dkim-atps=neutral","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20210112;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references:mime-version:content-transfer-encoding;\n\tbh=RughUZPLJCp5nFwjdB+7SjIyn+ztq4xtc1EQkx+ClCE=;\n\tb=MdFbgn4PPFvVWPh2C7Ay8kHq3DoDuVoBb63DE4s5Zot8IA86XuEkt7HM3hrCmr0EeQ\n\td0qPbnFhAjsn0yGpleLfgBwTj0v/tBJ07eVFxImFk4fcd4V8/qDKWq2Kyfksg7MjBzIk\n\t/AYsA7SmRXrYZ2Mj6tDvARJLW05RPdkscVR3fNhhrmG285SWdntKtfCH3i7f+IiFb/vw\n\tZajb81sm59B35rt2gs9vYMPkxGIw6sjDUST+8XUQkwAB8QYxYDmdEVGUG2g+x5E/mxkn\n\t2TjMh9L/Jv3C+qJ/3F+y2Rr1fcWJ0XFdG2Ly2lh6hlWcNVqwf+Jige96UgvXOPLvxv10\n\tDqNw==","X-Gm-Message-State":"AOAM530BAf4VV15g5tSaWsZTSnqqqDbqphm20mUrDlGA3+8OUE0YtGFP\n\tnsj+UlJJTd2Gl/eNSOTjswEM08SveQd96Q==","X-Google-Smtp-Source":"ABdhPJw9pM4CRdwJjOQJxGRB17JLdB6dd7Tk48GuKGq9lk+gCmN4U3aF1wJdQ23W62xbPHGVo6KUPg==","X-Received":"by 2002:a7b:cb46:0:b0:37b:dd79:e1c4 with SMTP id\n\tv6-20020a7bcb46000000b0037bdd79e1c4mr18940305wmj.39.1647858427964; \n\tMon, 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","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH v3 4/5] pipeline: raspberrypi: Repurpose\n\tRPi::Stream::reset()","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","From":"Naushir Patuck via libcamera-devel\n\t","Reply-To":"Naushir Patuck ","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"The original use of RPi::Stream::reset() was to clear the external flag state\nand free/clear out the framebuffers for the stream. However, the latter is now\ndone through PipelineHandlerRPi::configure(). Rework\nPipelineHandlerRPi::configure() to call RPi::Stream::setExternal() instead of\nRPi::Stream::reset() to achieve the same thing.\n\nRepurpose RPi::Stream::reset() to instead reset the state of the buffer handling\nlogic, where all internally allocated buffers are put back into the queue of\navailable buffers. As such, rename the function to RPi::Stream::resetbuffers()\nThis resetbuffers() is now called from PipelineHandlerRPi::start(), allowing the\npipeline handler to correctly deal with start()/stop()/start() sequences and\nreusing the buffers allocated on the first start().\n\nSigned-off-by: Naushir Patuck \nReviewed-by: David Plowman \nTested-by: David Plowman \n---\n src/libcamera/pipeline/raspberrypi/raspberrypi.cpp | 7 +++++--\n src/libcamera/pipeline/raspberrypi/rpi_stream.cpp | 13 ++++++-------\n src/libcamera/pipeline/raspberrypi/rpi_stream.h | 2 +-\n 3 files changed, 12 insertions(+), 10 deletions(-)","diff":"diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\nindex 92043962494b..0ff6acdceb66 100644\n--- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n+++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n@@ -693,7 +693,7 @@ int PipelineHandlerRPi::configure(Camera *camera, CameraConfiguration *config)\n \t/* Start by freeing all buffers and reset the Unicam and ISP stream states. */\n \tdata->freeBuffers();\n \tfor (auto const stream : data->streams_)\n-\t\tstream->reset();\n+\t\tstream->setExternal(false);\n \n \tBayerFormat::Packing packing = BayerFormat::Packing::CSI2;\n \tSize maxSize, sensorSize;\n@@ -991,6 +991,9 @@ int PipelineHandlerRPi::start(Camera *camera, const ControlList *controls)\n \tRPiCameraData *data = cameraData(camera);\n \tint ret;\n \n+\tfor (auto const stream : data->streams_)\n+\t\tstream->resetBuffers();\n+\n \tif (!data->buffersAllocated_) {\n \t\t/* Allocate buffers for internal pipeline usage. */\n \t\tret = prepareBuffers(camera);\n@@ -1031,7 +1034,7 @@ int PipelineHandlerRPi::start(Camera *camera, const ControlList *controls)\n \tdata->unicam_[Unicam::Image].dev()->setFrameStartEnabled(true);\n \n \t/*\n-\t * Reset the delayed controls with the gain and exposure values set by\n+\t * resetBuffers the delayed controls with the gain and exposure values set by\n \t * the IPA.\n \t */\n \tdata->delayedCtrls_->reset();\ndiff --git a/src/libcamera/pipeline/raspberrypi/rpi_stream.cpp b/src/libcamera/pipeline/raspberrypi/rpi_stream.cpp\nindex f446e1ce66c7..7a93efaa29da 100644\n--- a/src/libcamera/pipeline/raspberrypi/rpi_stream.cpp\n+++ b/src/libcamera/pipeline/raspberrypi/rpi_stream.cpp\n@@ -26,10 +26,12 @@ std::string Stream::name() const\n \treturn name_;\n }\n \n-void Stream::reset()\n+void Stream::resetBuffers()\n {\n-\texternal_ = false;\n-\tclearBuffers();\n+\t/* Add all internal buffers to the queue of usable buffers. */\n+\tavailableBuffers_ = {};\n+\tfor (auto const &buffer : internalBuffers_)\n+\t\tavailableBuffers_.push(buffer.get());\n }\n \n void Stream::setExternal(bool external)\n@@ -97,10 +99,7 @@ int Stream::prepareBuffers(unsigned int count)\n \n \t\t\t/* Add these exported buffers to the internal/external buffer list. */\n \t\t\tsetExportedBuffers(&internalBuffers_);\n-\n-\t\t\t/* Add these buffers to the queue of internal usable buffers. */\n-\t\t\tfor (auto const &buffer : internalBuffers_)\n-\t\t\t\tavailableBuffers_.push(buffer.get());\n+\t\t\tresetBuffers();\n \t\t}\n \n \t\t/* We must import all internal/external exported buffers. */\ndiff --git a/src/libcamera/pipeline/raspberrypi/rpi_stream.h b/src/libcamera/pipeline/raspberrypi/rpi_stream.h\nindex d6f49d34f8c8..c37f7e82eef6 100644\n--- a/src/libcamera/pipeline/raspberrypi/rpi_stream.h\n+++ b/src/libcamera/pipeline/raspberrypi/rpi_stream.h\n@@ -45,7 +45,7 @@ public:\n \tV4L2VideoDevice *dev() const;\n \tstd::string name() const;\n \tbool isImporter() const;\n-\tvoid reset();\n+\tvoid resetBuffers();\n \n \tvoid setExternal(bool external);\n \tbool isExternal() const;\n","prefixes":["libcamera-devel","v3","4/5"]}