Patch Detail
Show a patch.
GET /api/1.1/patches/18597/?format=api
{ "id": 18597, "url": "https://patchwork.libcamera.org/api/1.1/patches/18597/?format=api", "web_url": "https://patchwork.libcamera.org/patch/18597/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/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": "<20230503122035.32026-14-naush@raspberrypi.com>", "date": "2023-05-03T12:20:35", "name": "[libcamera-devel,13/13] pipeline: raspberrypi: Add stream flags to RPi::Stream", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "b25ab9275e5951883933dd9f9952f07245a989aa", "submitter": { "id": 34, "url": "https://patchwork.libcamera.org/api/1.1/people/34/?format=api", "name": "Naushir Patuck", "email": "naush@raspberrypi.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/18597/mbox/", "series": [ { "id": 3863, "url": "https://patchwork.libcamera.org/api/1.1/series/3863/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=3863", "date": "2023-05-03T12:20:22", "name": "Raspberry Pi: Code refactoring", "version": 1, "mbox": "https://patchwork.libcamera.org/series/3863/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/18597/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/18597/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 41FC3C0DA4\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 3 May 2023 12:21:05 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 0412B633C3;\n\tWed, 3 May 2023 14:21:05 +0200 (CEST)", "from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com\n\t[IPv6:2a00:1450:4864:20::32b])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id B0C96633B4\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 3 May 2023 14:21:03 +0200 (CEST)", "by mail-wm1-x32b.google.com with SMTP id\n\t5b1f17b1804b1-3f19afc4fbfso50885245e9.2\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 03 May 2023 05:21:03 -0700 (PDT)", "from localhost.localdomain ([93.93.133.154])\n\tby smtp.gmail.com with ESMTPSA id\n\tf23-20020a7bcd17000000b003ee443bf0c7sm1736785wmj.16.2023.05.03.05.21.02\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tWed, 03 May 2023 05:21:02 -0700 (PDT)" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/simple; d=libcamera.org;\n\ts=mail; t=1683116465;\n\tbh=KwBE0uPVA2vSMqX4i4juvfO9whsaBV4+pfIEQIzQDFs=;\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:Cc:\n\tFrom;\n\tb=CSWCeaKPapLezDSCPY9lb9N0gbwmoswib6bDpdIxrzctwgCDFD+qOohmXC6U7mIXq\n\tJIFbuN9Di/3xrOOXq8AlJCd5riA71W/ga6foblo2Eks6N2Q/983Hrvj6hhK/wugDVc\n\tX6jvljPOIITWKit2Q+RDDzBFQQfYq233T3qdu/81cqcLXh5JskcpmTOVEojuWYILjz\n\tftRl++YZabmXVJ/uZe6vmFvs9sqryUMmBGG/vUivCwkQDK6rjESSjVTTMSjzk6DEE5\n\tRy4c1KqJpiO0cnqaofp+TwvIKvGnkOqbKsdv8NT3R9BGWwAwOwLpq3tk4UxY/3cDdn\n\t2lypXZfBV8tsA==", "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=raspberrypi.com; s=google; t=1683116463; x=1685708463;\n\th=content-transfer-encoding:mime-version:references:in-reply-to\n\t:message-id:date:subject:cc:to:from:from:to:cc:subject:date\n\t:message-id:reply-to;\n\tbh=Zo95N/QeZOpCPpe+CBOXO5Itz+bJlZWdBtIRXvOcgIw=;\n\tb=LVlS7sMouP2iODT3/zH36ewYg1AQAiu7lSw3GYN16FLY3LJqhE6aXDIc6uwl2QhtfP\n\tlT/kLOCMNORkym8jW7iwcRy5O9Xs8ckHgtDbidJyQ2YOSj8pYcY/aoG9/xnoSJJqiYiX\n\tHzN7bnLjD7tK29yC8rDjpfOQyuoDpYEQmYWh8+P/Juc59oRtGz6nuy6AL8yAp0O35Qkk\n\tfnb/8fEVbuU9b3kf09O8WPZft6EPvvMGh8ZpO2vNQadIlpKeCEc8bKTd67ykVuEwXHZ4\n\tkthyCxDR2Iirby/RPEU7zGc78FNXH/7zBtxHP6kUZD72sKYQD0GkXVr8ARro9Mxev2NJ\n\tVOvw==" ], "Authentication-Results": "lancelot.ideasonboard.com; dkim=pass (2048-bit key; \n\tunprotected) header.d=raspberrypi.com\n\theader.i=@raspberrypi.com\n\theader.b=\"LVlS7sMo\"; dkim-atps=neutral", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20221208; t=1683116463; x=1685708463;\n\th=content-transfer-encoding:mime-version:references:in-reply-to\n\t:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc\n\t:subject:date:message-id:reply-to;\n\tbh=Zo95N/QeZOpCPpe+CBOXO5Itz+bJlZWdBtIRXvOcgIw=;\n\tb=bVauv1TuzRFOnIjPBUBy2XN5OQLtqPxEBB2FPhz8Qz/8FzI0mCdPQLkKJY1v9wdSal\n\tSwzj1oXIMf5SF1mukE/ya8IPBvWFg8D1wWI8+NuhUAyxfHYO2dS9RdiA4Tr2L/YYPRkc\n\t4n1Om1h8tEuZbVnAAzSOQIbQ2zBNohtMxt7wTczBFIglTmynNkS4kguIIZOlGoD5v3fw\n\txrFxlxcXVt+CLsEquu8CicedSd2KOD5CLSAALkmyKvUR4mk8RZrTrE6N/hpavJrU+u7u\n\tS50PMYmVztTkY0og+MXJW9HtDdD+6Th5pgsCApNvwmT4JIa2VLr77oEUTIVPNGUmz9PP\n\teeOA==", "X-Gm-Message-State": "AC+VfDxbCyaSprTi+bkJpa+YmXuDAouxHA3E4MQlc5g1LNazXyk11i8G\n\t0k+fHpStTCQKxQw7Z3sZ55lHxTDd261KQX2R4SjgJw==", "X-Google-Smtp-Source": "ACHHUZ6Dfm6U+LFhv1+ERowBjE23UAz4ajoZhVH2xsjO69FugU0KqydRRFPajCsNfrGF4k7w4Rhxmg==", "X-Received": "by 2002:a05:600c:299:b0:3f2:50ab:1bba with SMTP id\n\t25-20020a05600c029900b003f250ab1bbamr14908162wmk.19.1683116462874; \n\tWed, 03 May 2023 05:21:02 -0700 (PDT)", "To": "libcamera-devel@lists.libcamera.org", "Date": "Wed, 3 May 2023 13:20:35 +0100", "Message-Id": "<20230503122035.32026-14-naush@raspberrypi.com>", "X-Mailer": "git-send-email 2.34.1", "In-Reply-To": "<20230503122035.32026-1-naush@raspberrypi.com>", "References": "<20230503122035.32026-1-naush@raspberrypi.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH 13/13] pipeline: raspberrypi: Add stream\n\tflags to RPi::Stream", "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>", "Cc": "Jacopo Mondi <jacopo.mondi@ideasonboard.com>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Add a flags_ field to indicate stream state information in RPi::Stream.\nThis replaces the existing external_ and importOnly_ boolean flags.\n\nSigned-off-by: Naushir Patuck <naush@raspberrypi.com>\nReviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n---\n .../pipeline/rpi/common/pipeline_base.cpp | 8 ++--\n .../pipeline/rpi/common/rpi_stream.cpp | 40 ++++++++++--------\n .../pipeline/rpi/common/rpi_stream.h | 42 ++++++++++++-------\n src/libcamera/pipeline/rpi/vc4/vc4.cpp | 8 ++--\n 4 files changed, 60 insertions(+), 38 deletions(-)", "diff": "diff --git a/src/libcamera/pipeline/rpi/common/pipeline_base.cpp b/src/libcamera/pipeline/rpi/common/pipeline_base.cpp\nindex 69c67acd7d45..ba1797bcfef0 100644\n--- a/src/libcamera/pipeline/rpi/common/pipeline_base.cpp\n+++ b/src/libcamera/pipeline/rpi/common/pipeline_base.cpp\n@@ -31,6 +31,8 @@ using namespace RPi;\n \n LOG_DEFINE_CATEGORY(RPI)\n \n+using StreamFlag = RPi::Stream::StreamFlag;\n+\n namespace {\n \n constexpr unsigned int defaultRawBitDepth = 12;\n@@ -504,7 +506,7 @@ int PipelineHandlerBase::configure(Camera *camera, CameraConfiguration *config)\n \t/* Start by freeing all buffers and reset the stream states. */\n \tdata->freeBuffers();\n \tfor (auto const stream : data->streams_)\n-\t\tstream->setExternal(false);\n+\t\tstream->clearFlags(StreamFlag::External);\n \n \tstd::vector<CameraData::StreamParams> rawStreams, ispStreams;\n \tstd::optional<BayerFormat::Packing> packing;\n@@ -752,7 +754,7 @@ int PipelineHandlerBase::queueRequestDevice(Camera *camera, Request *request)\n \n \t/* Push all buffers supplied in the Request to the respective streams. */\n \tfor (auto stream : data->streams_) {\n-\t\tif (!stream->isExternal())\n+\t\tif (!(stream->getFlags() & StreamFlag::External))\n \t\t\tcontinue;\n \n \t\tFrameBuffer *buffer = request->findBuffer(stream);\n@@ -932,7 +934,7 @@ int PipelineHandlerBase::queueAllBuffers(Camera *camera)\n \tint ret;\n \n \tfor (auto const stream : data->streams_) {\n-\t\tif (!stream->isExternal()) {\n+\t\tif (!(stream->getFlags() & StreamFlag::External)) {\n \t\t\tret = stream->queueAllBuffers();\n \t\t\tif (ret < 0)\n \t\t\t\treturn ret;\ndiff --git a/src/libcamera/pipeline/rpi/common/rpi_stream.cpp b/src/libcamera/pipeline/rpi/common/rpi_stream.cpp\nindex b7e4130f5e56..c158843cb0ed 100644\n--- a/src/libcamera/pipeline/rpi/common/rpi_stream.cpp\n+++ b/src/libcamera/pipeline/rpi/common/rpi_stream.cpp\n@@ -14,6 +14,24 @@ LOG_DEFINE_CATEGORY(RPISTREAM)\n \n namespace RPi {\n \n+void Stream::setFlags(StreamFlags flags)\n+{\n+\tflags_ |= flags;\n+\n+\t/* Import streams cannot be external. */\n+\tASSERT(!(flags_ & StreamFlag::External) || !(flags_ & StreamFlag::ImportOnly));\n+}\n+\n+void Stream::clearFlags(StreamFlags flags)\n+{\n+\tflags_ &= ~flags;\n+}\n+\n+RPi::Stream::StreamFlags Stream::getFlags() const\n+{\n+\treturn flags_;\n+}\n+\n V4L2VideoDevice *Stream::dev() const\n {\n \treturn dev_.get();\n@@ -32,18 +50,6 @@ void Stream::resetBuffers()\n \t\tavailableBuffers_.push(buffer.get());\n }\n \n-void Stream::setExternal(bool external)\n-{\n-\t/* Import streams cannot be external. */\n-\tASSERT(!external || !importOnly_);\n-\texternal_ = external;\n-}\n-\n-bool Stream::isExternal() const\n-{\n-\treturn external_;\n-}\n-\n void Stream::setExportedBuffers(std::vector<std::unique_ptr<FrameBuffer>> *buffers)\n {\n \tfor (auto const &buffer : *buffers)\n@@ -57,7 +63,7 @@ const BufferMap &Stream::getBuffers() const\n \n unsigned int Stream::getBufferId(FrameBuffer *buffer) const\n {\n-\tif (importOnly_)\n+\tif (flags_ & StreamFlag::ImportOnly)\n \t\treturn 0;\n \n \t/* Find the buffer in the map, and return the buffer id. */\n@@ -88,7 +94,7 @@ int Stream::prepareBuffers(unsigned int count)\n {\n \tint ret;\n \n-\tif (!importOnly_) {\n+\tif (!(flags_ & StreamFlag::ImportOnly)) {\n \t\tif (count) {\n \t\t\t/* Export some frame buffers for internal use. */\n \t\t\tret = dev_->exportBuffers(count, &internalBuffers_);\n@@ -113,7 +119,7 @@ int Stream::prepareBuffers(unsigned int count)\n \t * \\todo Find a better heuristic, or, even better, an exact solution to\n \t * this issue.\n \t */\n-\tif (isExternal() || importOnly_)\n+\tif ((flags_ & StreamFlag::External) || (flags_ & StreamFlag::ImportOnly))\n \t\tcount = count * 2;\n \n \treturn dev_->importBuffers(count);\n@@ -160,7 +166,7 @@ int Stream::queueBuffer(FrameBuffer *buffer)\n \n void Stream::returnBuffer(FrameBuffer *buffer)\n {\n-\tif (!external_) {\n+\tif (!(flags_ & StreamFlag::External)) {\n \t\t/* For internal buffers, simply requeue back to the device. */\n \t\tqueueToDevice(buffer);\n \t\treturn;\n@@ -204,7 +210,7 @@ int Stream::queueAllBuffers()\n {\n \tint ret;\n \n-\tif (external_)\n+\tif (flags_ & StreamFlag::External)\n \t\treturn 0;\n \n \twhile (!availableBuffers_.empty()) {\ndiff --git a/src/libcamera/pipeline/rpi/common/rpi_stream.h b/src/libcamera/pipeline/rpi/common/rpi_stream.h\nindex b8c74de35863..6edd304bdfe2 100644\n--- a/src/libcamera/pipeline/rpi/common/rpi_stream.h\n+++ b/src/libcamera/pipeline/rpi/common/rpi_stream.h\n@@ -12,6 +12,7 @@\n #include <unordered_map>\n #include <vector>\n \n+#include <libcamera/base/flags.h>\n #include <libcamera/stream.h>\n \n #include \"libcamera/internal/v4l2_videodevice.h\"\n@@ -37,25 +38,41 @@ enum BufferMask {\n class Stream : public libcamera::Stream\n {\n public:\n+\tenum class StreamFlag {\n+\t\tNone\t\t= 0,\n+\t\t/*\n+\t\t * Indicates that this stream only imports buffers, e.g. the ISP\n+\t\t * input stream.\n+\t\t */\n+\t\tImportOnly\t= (1 << 0),\n+\t\t/*\n+\t\t * Indicates that this stream is active externally, i.e. the\n+\t\t * buffers might be provided by (and returned to) the application.\n+\t\t */\n+\t\tExternal\t= (1 << 1),\n+\t};\n+\n+\tusing StreamFlags = Flags<StreamFlag>;\n+\n \tStream()\n-\t\t: id_(BufferMask::MaskID)\n+\t\t: flags_(StreamFlag::None), id_(BufferMask::MaskID)\n \t{\n \t}\n \n-\tStream(const char *name, MediaEntity *dev, bool importOnly = false)\n-\t\t: external_(false), importOnly_(importOnly), name_(name),\n+\tStream(const char *name, MediaEntity *dev, StreamFlags flags = StreamFlag::None)\n+\t\t: flags_(flags), name_(name),\n \t\t dev_(std::make_unique<V4L2VideoDevice>(dev)), id_(BufferMask::MaskID)\n \t{\n \t}\n \n+\tvoid setFlags(StreamFlags flags);\n+\tvoid clearFlags(StreamFlags flags);\n+\tStreamFlags getFlags() const;\n+\n \tV4L2VideoDevice *dev() const;\n \tconst std::string &name() const;\n-\tbool isImporter() const;\n \tvoid resetBuffers();\n \n-\tvoid setExternal(bool external);\n-\tbool isExternal() const;\n-\n \tvoid setExportedBuffers(std::vector<std::unique_ptr<FrameBuffer>> *buffers);\n \tconst BufferMap &getBuffers() const;\n \tunsigned int getBufferId(FrameBuffer *buffer) const;\n@@ -112,14 +129,7 @@ private:\n \tvoid clearBuffers();\n \tint queueToDevice(FrameBuffer *buffer);\n \n-\t/*\n-\t * Indicates that this stream is active externally, i.e. the buffers\n-\t * might be provided by (and returned to) the application.\n-\t */\n-\tbool external_;\n-\n-\t/* Indicates that this stream only imports buffers, e.g. ISP input. */\n-\tbool importOnly_;\n+\tStreamFlags flags_;\n \n \t/* Stream name identifier. */\n \tstd::string name_;\n@@ -182,4 +192,6 @@ public:\n \n } /* namespace RPi */\n \n+LIBCAMERA_FLAGS_ENABLE_OPERATORS(RPi::Stream::StreamFlag)\n+\n } /* namespace libcamera */\ndiff --git a/src/libcamera/pipeline/rpi/vc4/vc4.cpp b/src/libcamera/pipeline/rpi/vc4/vc4.cpp\nindex c3a40326b228..018cf4881d0e 100644\n--- a/src/libcamera/pipeline/rpi/vc4/vc4.cpp\n+++ b/src/libcamera/pipeline/rpi/vc4/vc4.cpp\n@@ -24,6 +24,8 @@ namespace libcamera {\n \n LOG_DECLARE_CATEGORY(RPI)\n \n+using StreamFlag = RPi::Stream::StreamFlag;\n+\n namespace {\n \n enum class Unicam : unsigned int { Image, Embedded };\n@@ -318,7 +320,7 @@ int PipelineHandlerVc4::platformRegister(std::unique_ptr<RPi::CameraData> &camer\n \t}\n \n \t/* Tag the ISP input stream as an import stream. */\n-\tdata->isp_[Isp::Input] = RPi::Stream(\"ISP Input\", ispOutput0, true);\n+\tdata->isp_[Isp::Input] = RPi::Stream(\"ISP Input\", ispOutput0, StreamFlag::ImportOnly);\n \tdata->isp_[Isp::Output0] = RPi::Stream(\"ISP Output0\", ispCapture1);\n \tdata->isp_[Isp::Output1] = RPi::Stream(\"ISP Output1\", ispCapture2);\n \tdata->isp_[Isp::Stats] = RPi::Stream(\"ISP Stats\", ispCapture3);\n@@ -500,7 +502,7 @@ int Vc4CameraData::platformConfigure(const V4L2SubdeviceFormat &sensorFormat,\n \t */\n \tif (!rawStreams.empty()) {\n \t\trawStreams[0].cfg->setStream(&unicam_[Unicam::Image]);\n-\t\tunicam_[Unicam::Image].setExternal(true);\n+\t\tunicam_[Unicam::Image].setFlags(StreamFlag::External);\n \t}\n \n \tret = isp_[Isp::Input].dev()->setFormat(&unicamFormat);\n@@ -545,7 +547,7 @@ int Vc4CameraData::platformConfigure(const V4L2SubdeviceFormat &sensorFormat,\n \t\t\t<< ColorSpace::toString(cfg->colorSpace);\n \n \t\tcfg->setStream(stream);\n-\t\tstream->setExternal(true);\n+\t\tstream->setFlags(StreamFlag::External);\n \t}\n \n \tispOutputTotal_ = outStreams.size();\n", "prefixes": [ "libcamera-devel", "13/13" ] }