Patch Detail
Show a patch.
GET /api/patches/15545/?format=api
{ "id": 15545, "url": "https://patchwork.libcamera.org/api/patches/15545/?format=api", "web_url": "https://patchwork.libcamera.org/patch/15545/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20220325090903.880311-5-naush@raspberrypi.com>", "date": "2022-03-25T09:08:59", "name": "[libcamera-devel,v5,4/8] pipeline: raspberrypi: Repurpose RPi::Stream::reset()", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "2d6c6cc923f4a3395263733a081619094305e9bc", "submitter": { "id": 34, "url": "https://patchwork.libcamera.org/api/people/34/?format=api", "name": "Naushir Patuck", "email": "naush@raspberrypi.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/15545/mbox/", "series": [ { "id": 2999, "url": "https://patchwork.libcamera.org/api/series/2999/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=2999", "date": "2022-03-25T09:08:55", "name": "Raspberry Pi: Efficient start/stop/start sequences", "version": 5, "mbox": "https://patchwork.libcamera.org/series/2999/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/15545/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/15545/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "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 4E653C0F1B\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 25 Mar 2022 09:09:13 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id EE7AD604EA;\n\tFri, 25 Mar 2022 10:09:12 +0100 (CET)", "from mail-wm1-x333.google.com (mail-wm1-x333.google.com\n\t[IPv6:2a00:1450:4864:20::333])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 70A7660136\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 25 Mar 2022 10:09:10 +0100 (CET)", "by mail-wm1-x333.google.com with SMTP id r64so4075225wmr.4\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 25 Mar 2022 02:09:10 -0700 (PDT)", "from naush-laptop.pitowers.org\n\t([2a00:1098:3142:14:478c:773f:4734:d0bc])\n\tby smtp.gmail.com with ESMTPSA id\n\tc4-20020a056000184400b0020584c40778sm4915297wri.103.2022.03.25.02.09.08\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tFri, 25 Mar 2022 02:09:09 -0700 (PDT)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1648199353;\n\tbh=LAyJvKIGT2q0yec59HHtU1koPIGLOBZBSrRmPJWFo0Y=;\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=HuQdvgV7GFOII407ml0X0rFA7273Sj2YVeJLG/n2W+tB4wdIgNjHAeOkyHc1SFHOZ\n\tPvAsTmqcsK6Tckrbr46356W1zxZJGFQyJSPxGlnFCWDtGkbhb+qvQoPCZ7b/FdjZfG\n\t+rPBy8/47uWucNLGLrU4ti0xkGZ4r4VjjO6GzkFXraBUt1f3NyJmoQczAi7K5YB+4q\n\t9KvPFF3C+BTD9Eyvj4OjUJMRMIRWLSrA//wK6nKYl79sEWKgx4/EVynNJemN1pK3ar\n\tRc+5lg9mh9nXh1jSz3EyJuf6uHJ6sjOH23u2jSsvP+kEnF98zTV49I1rF71krbp+C2\n\tf10rKulzQOtnw==", "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=y+AU3uHdQY363TBVi7RlIPz9CMOUvtyCfstDvCKShdo=;\n\tb=NOl8nIL7fd8pgPaD0niAYHEeYWSc2nFhKsdGhOI+jy14v/fKVNwUDrdRMdDvXk0x0g\n\tTqgz+Ogzs4TUYJlzLRTAiFgk00SC/rE2vauCXrAxjA9QeF6M7L88VkMFMnN9892ott0B\n\tR1Jy+1A2w25jwAXJ8ZGohAgkup5UMpfjjOyJzZ86hdKfPU0nCFwxqtR3Su3wps5Z1TVN\n\tNI3aY0rf+oJXp2PsOPMi/nfBZnw50Cjhp0pJulVyxUmx4Es+qypV7oau2YqSdVWiDV0i\n\tgn54qsZ3wjSLyzagCORU8lgZCUlpe1Qm6l5fjq0xOo30Sqtp6q85A1iihPJFMu9cyiAN\n\tC0eQ==" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (2048-bit key; \n\tunprotected) header.d=raspberrypi.com\n\theader.i=@raspberrypi.com\n\theader.b=\"NOl8nIL7\"; 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=y+AU3uHdQY363TBVi7RlIPz9CMOUvtyCfstDvCKShdo=;\n\tb=qF79z5ISDUyXXB1yrhkKRyVEvhNIh22bqRJlzj9aEnO+HCfpJ4G2Xy+Ly1zkPK7YcH\n\t67xfRPncWYkjrIzFbmVA/9r/tqDrgEYK11gRst0KV873bll81RomvwbtpLm4055ryp5l\n\tJal07dddz2TVXfIGU/Ev5Z0Z/woYC7mRJFG23j7jLqPKcgsF5jWSVdC5H/KhDZAEYjW7\n\tZX3O4yObAug2tX7FW4MXMXwU1zGNd0V7gj0uWi1+dhMdESGf+sdtlMu/iOnpgaYBNzUC\n\tG8hd6kKQ3I0YNAODrb2fiNYDbRN3IqMPVfr2A3mfSjKzrM2hAIU2IVGqtC1YSUjFRDH+\n\t3OoQ==", "X-Gm-Message-State": "AOAM530nME803Aha6JTfcdC0eEULQL8hvLzZ2PsZhNTtEaxPm5zGqYG4\n\tILoOWMZIlG0j+gi0QlK+S2dzOLzIknn0ZA==", "X-Google-Smtp-Source": "ABdhPJwQoYPJtTVaL9zTYPGZzjdigSLYXMsY9RhoW3HPV3AcM0R6ZOImel1cNxvT4EOk0pZTf7dp6Q==", "X-Received": "by 2002:a05:600c:20a:b0:38c:95bf:3289 with SMTP id\n\t10-20020a05600c020a00b0038c95bf3289mr18266049wmi.134.1648199349926; \n\tFri, 25 Mar 2022 02:09:09 -0700 (PDT)", "To": "libcamera-devel@lists.libcamera.org", "Date": "Fri, 25 Mar 2022 09:08:59 +0000", "Message-Id": "<20220325090903.880311-5-naush@raspberrypi.com>", "X-Mailer": "git-send-email 2.25.1", "In-Reply-To": "<20220325090903.880311-1-naush@raspberrypi.com>", "References": "<20220325090903.880311-1-naush@raspberrypi.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v5 4/8] pipeline: raspberrypi: Repurpose\n\tRPi::Stream::reset()", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "From": "Naushir Patuck via libcamera-devel\n\t<libcamera-devel@lists.libcamera.org>", "Reply-To": "Naushir Patuck <naush@raspberrypi.com>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "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 <naush@raspberrypi.com>\nReviewed-by: David Plowman <david.plowman@raspberrypi.com>\nTested-by: David Plowman <david.plowman@raspberrypi.com>\nReviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n---\n src/libcamera/pipeline/raspberrypi/raspberrypi.cpp | 5 ++++-\n src/libcamera/pipeline/raspberrypi/rpi_stream.cpp | 13 ++++++-------\n src/libcamera/pipeline/raspberrypi/rpi_stream.h | 2 +-\n 3 files changed, 11 insertions(+), 9 deletions(-)", "diff": "diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\nindex 92043962494b..8fd79be67988 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);\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", "v5", "4/8" ] }