{"id":9166,"url":"https://patchwork.libcamera.org/api/patches/9166/?format=json","web_url":"https://patchwork.libcamera.org/patch/9166/","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":"<20200804095850.275499-2-naush@raspberrypi.com>","date":"2020-08-04T09:58:39","name":"[libcamera-devel,v6,01/12] libcamera: pipeline: raspberrypi: Move RPiStream into a separate file","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"4b6b1dccad347de6e6625f648db32ab8eef284f9","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/9166/mbox/","series":[{"id":1187,"url":"https://patchwork.libcamera.org/api/series/1187/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1187","date":"2020-08-04T09:58:38","name":"Zero-copy RAW stream work","version":6,"mbox":"https://patchwork.libcamera.org/series/1187/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/9166/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/9166/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 755DFBD86F\n\tfor ;\n\tTue, 4 Aug 2020 09:58:59 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 4334C60499;\n\tTue, 4 Aug 2020 11:58:59 +0200 (CEST)","from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com\n\t[IPv6:2a00:1450:4864:20::42b])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 942216042B\n\tfor ;\n\tTue, 4 Aug 2020 11:58:57 +0200 (CEST)","by mail-wr1-x42b.google.com with SMTP id z18so33237638wrm.12\n\tfor ;\n\tTue, 04 Aug 2020 02:58:57 -0700 (PDT)","from naushir-VirtualBox.patuck.local ([88.97.76.4])\n\tby smtp.gmail.com with ESMTPSA id\n\t32sm34047234wrh.18.2020.08.04.02.58.55\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tTue, 04 Aug 2020 02:58:55 -0700 (PDT)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=raspberrypi.com header.i=@raspberrypi.com\n\theader.b=\"g0ajAWrB\"; dkim-atps=neutral","DKIM-Signature":"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=BX33WxPjQxFM26LTJ/1Sd5KBaSlmZ/nG5OzAMvNlULg=;\n\tb=g0ajAWrBUI/oEvr+Gwe0fNn+GKOgFUrijL4JwKHOnhEDxSZZjm6lTD6g4H7h3o0Lup\n\t+IvHTWq69d9qhHvSkNrs9j7n6FOEq0rl0kqgVtJDKu+nNlbTufNur+ZsauD1qKstbeeZ\n\tKzfjay1bWR+D3efRUjjb0inmEj/n4BZmE+GowpZg92gARnEp4FnA/YGIq4BwQqKX15pP\n\tDQNQiGe3WVtFbeDLAawwUwXdGZJKov2zwzcP4EGr26edCaCBsiahQI4QGStDq8auZ+DT\n\tH/7Ln0oTZN2IMftzluZI85VBf/rplcunHk9gL8BDN4G2eNrgUb/CenaTXGi+cF50k8A7\n\t79FA==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\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=BX33WxPjQxFM26LTJ/1Sd5KBaSlmZ/nG5OzAMvNlULg=;\n\tb=chEh6PW6dgWBeMZFEaKcSNHEbYz4JhXw5oEYEaweCzjc8lo3TSOeVew4s9yCToi1j7\n\tQsrokkSerqU792NkZ2OJOI11uVvXq68yCaE8GipzSpcP63sXB1hjawXBmAhJz2Fk09BJ\n\te1F4y9i1LA/QgYTdPk8xhhcNQvhzPwgW4Mx5a12V+nwcXC8EE3dgKsXFRgTBw6pXOHnK\n\tBGnzZCF/I6uB9PotXijhIIYJ+s4p3FVKkiz+zxIb1X1yanjb2ThxFdtr2jO8nwpuHIqZ\n\ta6CsCZebMG4SWvPMEA5dtyk1xfIDB3lxEm7MCdM4/dhZYiQ2l/CLreAL+4b/BTbPciI3\n\tqN0w==","X-Gm-Message-State":"AOAM532bLhPjIP04AyfPTBhK4NhBzpX6hyAj1sPgqmU3P+KgRTRIS+MP\n\twsvqH5pidHuVOg71o/qv7ftplgNPUqNW2w==","X-Google-Smtp-Source":"ABdhPJy4Y2l6wkEd1V3fFQDQn4i46LDPlD2+FNpsHQGE0GwP54wCwqNpQO+ae4x/ReF7irjCTaXCxA==","X-Received":"by 2002:adf:82d5:: with SMTP id\n\t79mr18178566wrc.282.1596535136648; \n\tTue, 04 Aug 2020 02:58:56 -0700 (PDT)","From":"Naushir Patuck ","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 4 Aug 2020 10:58:39 +0100","Message-Id":"<20200804095850.275499-2-naush@raspberrypi.com>","X-Mailer":"git-send-email 2.25.1","In-Reply-To":"<20200804095850.275499-1-naush@raspberrypi.com>","References":"<20200804095850.275499-1-naush@raspberrypi.com>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v6 01/12] libcamera: pipeline:\n\traspberrypi: Move RPiStream into a separate file","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","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Put RPiStream into the RPi namespace and add a new log category (RPISTREAM).\nReorder methods into logical groups for readability.\n\nThere are no functional changes in this commit.\n\nSigned-off-by: Naushir Patuck \nReviewed-by: Niklas Söderlund \nReviewed-by: Kieran Bingham \nReviewed-by: Laurent Pinchart \nTested-by: David Plowman \n---\n .../pipeline/raspberrypi/meson.build | 1 +\n .../pipeline/raspberrypi/raspberrypi.cpp | 193 ++----------------\n .../pipeline/raspberrypi/rpi_stream.cpp | 116 +++++++++++\n .../pipeline/raspberrypi/rpi_stream.h | 107 ++++++++++\n 4 files changed, 243 insertions(+), 174 deletions(-)\n create mode 100644 src/libcamera/pipeline/raspberrypi/rpi_stream.cpp\n create mode 100644 src/libcamera/pipeline/raspberrypi/rpi_stream.h","diff":"diff --git a/src/libcamera/pipeline/raspberrypi/meson.build b/src/libcamera/pipeline/raspberrypi/meson.build\nindex ae0aed3b..7c5b6ff7 100644\n--- a/src/libcamera/pipeline/raspberrypi/meson.build\n+++ b/src/libcamera/pipeline/raspberrypi/meson.build\n@@ -3,5 +3,6 @@\n libcamera_sources += files([\n 'dma_heaps.cpp',\n 'raspberrypi.cpp',\n+ 'rpi_stream.cpp',\n 'staggered_ctrl.cpp',\n ])\ndiff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\nindex 82a0a4df..90331ede 100644\n--- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n+++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n@@ -19,7 +19,6 @@\n #include \n #include \n #include \n-#include \n \n #include \n \n@@ -33,6 +32,7 @@\n #include \"libcamera/internal/v4l2_videodevice.h\"\n \n #include \"dma_heaps.h\"\n+#include \"rpi_stream.h\"\n #include \"staggered_ctrl.h\"\n \n namespace libcamera {\n@@ -122,165 +122,10 @@ V4L2DeviceFormat findBestMode(V4L2VideoDevice::Formats &formatsMap,\n \treturn bestMode;\n }\n \n-} /* namespace */\n-\n-/*\n- * Device stream abstraction for either an internal or external stream.\n- * Used for both Unicam and the ISP.\n- */\n-class RPiStream : public Stream\n-{\n-public:\n-\tRPiStream()\n-\t{\n-\t}\n-\n-\tRPiStream(const char *name, MediaEntity *dev, bool importOnly = false)\n-\t\t: external_(false), importOnly_(importOnly), name_(name),\n-\t\t dev_(std::make_unique(dev))\n-\t{\n-\t}\n-\n-\tV4L2VideoDevice *dev() const\n-\t{\n-\t\treturn dev_.get();\n-\t}\n-\n-\tvoid setExternal(bool external)\n-\t{\n-\t\texternal_ = external;\n-\t}\n-\n-\tbool isExternal() const\n-\t{\n-\t\t/*\n-\t\t * Import streams cannot be external.\n-\t\t *\n-\t\t * RAW capture is a special case where we simply copy the RAW\n-\t\t * buffer out of the request. All other buffer handling happens\n-\t\t * as if the stream is internal.\n-\t\t */\n-\t\treturn external_ && !importOnly_;\n-\t}\n-\n-\tbool isImporter() const\n-\t{\n-\t\treturn importOnly_;\n-\t}\n-\n-\tvoid reset()\n-\t{\n-\t\texternal_ = false;\n-\t\tinternalBuffers_.clear();\n-\t}\n-\n-\tstd::string name() const\n-\t{\n-\t\treturn name_;\n-\t}\n-\n-\tvoid setExternalBuffers(std::vector> *buffers)\n-\t{\n-\t\texternalBuffers_ = buffers;\n-\t}\n-\n-\tconst std::vector> *getBuffers() const\n-\t{\n-\t\treturn external_ ? externalBuffers_ : &internalBuffers_;\n-\t}\n-\n-\tvoid releaseBuffers()\n-\t{\n-\t\tdev_->releaseBuffers();\n-\t\tif (!external_ && !importOnly_)\n-\t\t\tinternalBuffers_.clear();\n-\t}\n-\n-\tint importBuffers(unsigned int count)\n-\t{\n-\t\treturn dev_->importBuffers(count);\n-\t}\n-\n-\tint allocateBuffers(unsigned int count)\n-\t{\n-\t\treturn dev_->allocateBuffers(count, &internalBuffers_);\n-\t}\n-\n-\tint queueBuffers()\n-\t{\n-\t\tif (external_)\n-\t\t\treturn 0;\n-\n-\t\tfor (auto &b : internalBuffers_) {\n-\t\t\tint ret = dev_->queueBuffer(b.get());\n-\t\t\tif (ret) {\n-\t\t\t\tLOG(RPI, Error) << \"Failed to queue buffers for \"\n-\t\t\t\t\t\t<< name_;\n-\t\t\t\treturn ret;\n-\t\t\t}\n-\t\t}\n-\n-\t\treturn 0;\n-\t}\n-\n-\tbool findFrameBuffer(FrameBuffer *buffer) const\n-\t{\n-\t\tauto start = external_ ? externalBuffers_->begin() : internalBuffers_.begin();\n-\t\tauto end = external_ ? externalBuffers_->end() : internalBuffers_.end();\n-\n-\t\tif (importOnly_)\n-\t\t\treturn false;\n-\n-\t\tif (std::find_if(start, end,\n-\t\t\t\t [buffer](std::unique_ptr const &ref) { return ref.get() == buffer; }) != end)\n-\t\t\treturn true;\n-\n-\t\treturn false;\n-\t}\n-\n-private:\n-\t/*\n-\t * Indicates that this stream is active externally, i.e. the buffers\n-\t * are provided by the application.\n-\t */\n-\tbool external_;\n-\t/* Indicates that this stream only imports buffers, e.g. ISP input. */\n-\tbool importOnly_;\n-\t/* Stream name identifier. */\n-\tstd::string name_;\n-\t/* The actual device stream. */\n-\tstd::unique_ptr dev_;\n-\t/* Internally allocated framebuffers associated with this device stream. */\n-\tstd::vector> internalBuffers_;\n-\t/* Externally allocated framebuffers associated with this device stream. */\n-\tstd::vector> *externalBuffers_;\n-};\n-\n-/*\n- * The following class is just a convenient (and typesafe) array of device\n- * streams indexed with an enum class.\n- */\n enum class Unicam : unsigned int { Image, Embedded };\n enum class Isp : unsigned int { Input, Output0, Output1, Stats };\n \n-template\n-class RPiDevice : public std::array\n-{\n-private:\n-\tconstexpr auto index(E e) const noexcept\n-\t{\n-\t\treturn static_cast>(e);\n-\t}\n-public:\n-\tRPiStream &operator[](E e)\n-\t{\n-\t\treturn std::array::operator[](index(e));\n-\t}\n-\tconst RPiStream &operator[](E e) const\n-\t{\n-\t\treturn std::array::operator[](index(e));\n-\t}\n-};\n+} /* namespace */\n \n class RPiCameraData : public CameraData\n {\n@@ -304,15 +149,15 @@ public:\n \tvoid ispOutputDequeue(FrameBuffer *buffer);\n \n \tvoid clearIncompleteRequests();\n-\tvoid handleStreamBuffer(FrameBuffer *buffer, const RPiStream *stream);\n+\tvoid handleStreamBuffer(FrameBuffer *buffer, const RPi::RPiStream *stream);\n \tvoid handleState();\n \n \tCameraSensor *sensor_;\n \t/* Array of Unicam and ISP device streams and associated buffers/streams. */\n-\tRPiDevice unicam_;\n-\tRPiDevice isp_;\n+\tRPi::RPiDevice unicam_;\n+\tRPi::RPiDevice isp_;\n \t/* The vector below is just for convenience when iterating over all streams. */\n-\tstd::vector streams_;\n+\tstd::vector streams_;\n \t/* Buffers passed to the IPA. */\n \tstd::vector ipaBuffers_;\n \n@@ -761,7 +606,7 @@ int PipelineHandlerRPi::configure(Camera *camera, CameraConfiguration *config)\n int PipelineHandlerRPi::exportFrameBuffers(Camera *camera, Stream *stream,\n \t\t\t\t\t std::vector> *buffers)\n {\n-\tRPiStream *s = static_cast(stream);\n+\tRPi::RPiStream *s = static_cast(stream);\n \tunsigned int count = stream->configuration().bufferCount;\n \tint ret = s->dev()->exportBuffers(count, buffers);\n \n@@ -907,14 +752,14 @@ bool PipelineHandlerRPi::match(DeviceEnumerator *enumerator)\n \tstd::unique_ptr data = std::make_unique(this);\n \n \t/* Locate and open the unicam video streams. */\n-\tdata->unicam_[Unicam::Embedded] = RPiStream(\"Unicam Embedded\", unicam_->getEntityByName(\"unicam-embedded\"));\n-\tdata->unicam_[Unicam::Image] = RPiStream(\"Unicam Image\", unicam_->getEntityByName(\"unicam-image\"));\n+\tdata->unicam_[Unicam::Embedded] = RPi::RPiStream(\"Unicam Embedded\", unicam_->getEntityByName(\"unicam-embedded\"));\n+\tdata->unicam_[Unicam::Image] = RPi::RPiStream(\"Unicam Image\", unicam_->getEntityByName(\"unicam-image\"));\n \n \t/* Tag the ISP input stream as an import stream. */\n-\tdata->isp_[Isp::Input] = RPiStream(\"ISP Input\", isp_->getEntityByName(\"bcm2835-isp0-output0\"), true);\n-\tdata->isp_[Isp::Output0] = RPiStream(\"ISP Output0\", isp_->getEntityByName(\"bcm2835-isp0-capture1\"));\n-\tdata->isp_[Isp::Output1] = RPiStream(\"ISP Output1\", isp_->getEntityByName(\"bcm2835-isp0-capture2\"));\n-\tdata->isp_[Isp::Stats] = RPiStream(\"ISP Stats\", isp_->getEntityByName(\"bcm2835-isp0-capture3\"));\n+\tdata->isp_[Isp::Input] = RPi::RPiStream(\"ISP Input\", isp_->getEntityByName(\"bcm2835-isp0-output0\"), true);\n+\tdata->isp_[Isp::Output0] = RPi::RPiStream(\"ISP Output0\", isp_->getEntityByName(\"bcm2835-isp0-capture1\"));\n+\tdata->isp_[Isp::Output1] = RPi::RPiStream(\"ISP Output1\", isp_->getEntityByName(\"bcm2835-isp0-capture2\"));\n+\tdata->isp_[Isp::Stats] = RPi::RPiStream(\"ISP Stats\", isp_->getEntityByName(\"bcm2835-isp0-capture3\"));\n \n \t/* This is just for convenience so that we can easily iterate over all streams. */\n \tfor (auto &stream : data->unicam_)\n@@ -1004,7 +849,7 @@ int PipelineHandlerRPi::prepareBuffers(Camera *camera)\n \t */\n \tunsigned int maxBuffers = 0;\n \tfor (const Stream *s : camera->streams())\n-\t\tif (static_cast(s)->isExternal())\n+\t\tif (static_cast(s)->isExternal())\n \t\t\tmaxBuffers = std::max(maxBuffers, s->configuration().bufferCount);\n \n \tfor (auto const stream : data->streams_) {\n@@ -1254,12 +1099,12 @@ done:\n \n void RPiCameraData::unicamBufferDequeue(FrameBuffer *buffer)\n {\n-\tconst RPiStream *stream = nullptr;\n+\tconst RPi::RPiStream *stream = nullptr;\n \n \tif (state_ == State::Stopped)\n \t\treturn;\n \n-\tfor (RPiStream const &s : unicam_) {\n+\tfor (RPi::RPiStream const &s : unicam_) {\n \t\tif (s.findFrameBuffer(buffer)) {\n \t\t\tstream = &s;\n \t\t\tbreak;\n@@ -1315,12 +1160,12 @@ void RPiCameraData::ispInputDequeue(FrameBuffer *buffer)\n \n void RPiCameraData::ispOutputDequeue(FrameBuffer *buffer)\n {\n-\tconst RPiStream *stream = nullptr;\n+\tconst RPi::RPiStream *stream = nullptr;\n \n \tif (state_ == State::Stopped)\n \t\treturn;\n \n-\tfor (RPiStream const &s : isp_) {\n+\tfor (RPi::RPiStream const &s : isp_) {\n \t\tif (s.findFrameBuffer(buffer)) {\n \t\t\tstream = &s;\n \t\t\tbreak;\n@@ -1401,7 +1246,7 @@ void RPiCameraData::clearIncompleteRequests()\n \t}\n }\n \n-void RPiCameraData::handleStreamBuffer(FrameBuffer *buffer, const RPiStream *stream)\n+void RPiCameraData::handleStreamBuffer(FrameBuffer *buffer, const RPi::RPiStream *stream)\n {\n \tif (stream->isExternal()) {\n \t\tif (!dropFrame_) {\ndiff --git a/src/libcamera/pipeline/raspberrypi/rpi_stream.cpp b/src/libcamera/pipeline/raspberrypi/rpi_stream.cpp\nnew file mode 100644\nindex 00000000..2e52bd5c\n--- /dev/null\n+++ b/src/libcamera/pipeline/raspberrypi/rpi_stream.cpp\n@@ -0,0 +1,116 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2020, Raspberry Pi (Trading) Ltd.\n+ *\n+ * rpi_stream.cpp - Raspberry Pi device stream abstraction class.\n+ */\n+#include \"rpi_stream.h\"\n+\n+#include \"libcamera/internal/log.h\"\n+\n+namespace libcamera {\n+\n+LOG_DEFINE_CATEGORY(RPISTREAM)\n+\n+namespace RPi {\n+\n+V4L2VideoDevice *RPiStream::dev() const\n+{\n+\treturn dev_.get();\n+}\n+\n+std::string RPiStream::name() const\n+{\n+\treturn name_;\n+}\n+\n+void RPiStream::reset()\n+{\n+\texternal_ = false;\n+\tinternalBuffers_.clear();\n+}\n+\n+bool RPiStream::isImporter() const\n+{\n+\treturn importOnly_;\n+}\n+\n+void RPiStream::setExternal(bool external)\n+{\n+\texternal_ = external;\n+}\n+\n+bool RPiStream::isExternal() const\n+{\n+\t/*\n+\t * Import streams cannot be external.\n+\t *\n+\t * RAW capture is a special case where we simply copy the RAW\n+\t * buffer out of the request. All other buffer handling happens\n+\t * as if the stream is internal.\n+\t */\n+\treturn external_ && !importOnly_;\n+}\n+\n+void RPiStream::setExternalBuffers(std::vector> *buffers)\n+{\n+\texternalBuffers_ = buffers;\n+}\n+\n+const std::vector> *RPiStream::getBuffers() const\n+{\n+\treturn external_ ? externalBuffers_ : &internalBuffers_;\n+}\n+\n+bool RPiStream::findFrameBuffer(FrameBuffer *buffer) const\n+{\n+\tauto start = external_ ? externalBuffers_->begin() : internalBuffers_.begin();\n+\tauto end = external_ ? externalBuffers_->end() : internalBuffers_.end();\n+\n+\tif (importOnly_)\n+\t\treturn false;\n+\n+\tif (std::find_if(start, end,\n+\t\t\t [buffer](std::unique_ptr const &ref) { return ref.get() == buffer; }) != end)\n+\t\treturn true;\n+\n+\treturn false;\n+}\n+\n+int RPiStream::importBuffers(unsigned int count)\n+{\n+\treturn dev_->importBuffers(count);\n+}\n+\n+int RPiStream::allocateBuffers(unsigned int count)\n+{\n+\treturn dev_->allocateBuffers(count, &internalBuffers_);\n+}\n+\n+int RPiStream::queueBuffers()\n+{\n+\tif (external_)\n+\t\treturn 0;\n+\n+\tfor (auto &b : internalBuffers_) {\n+\t\tint ret = dev_->queueBuffer(b.get());\n+\t\tif (ret) {\n+\t\t\tLOG(RPISTREAM, Error) << \"Failed to queue buffers for \"\n+\t\t\t\t\t << name_;\n+\t\t\treturn ret;\n+\t\t}\n+\t}\n+\n+\treturn 0;\n+}\n+\n+void RPiStream::releaseBuffers()\n+{\n+\tdev_->releaseBuffers();\n+\tif (!external_ && !importOnly_)\n+\t\tinternalBuffers_.clear();\n+}\n+\n+} /* namespace RPi */\n+\n+} /* namespace libcamera */\ndiff --git a/src/libcamera/pipeline/raspberrypi/rpi_stream.h b/src/libcamera/pipeline/raspberrypi/rpi_stream.h\nnew file mode 100644\nindex 00000000..8fcf522b\n--- /dev/null\n+++ b/src/libcamera/pipeline/raspberrypi/rpi_stream.h\n@@ -0,0 +1,107 @@\n+/* SPDX-License-Identifier: LGPL-2.1-or-later */\n+/*\n+ * Copyright (C) 2020, Raspberry Pi (Trading) Ltd.\n+ *\n+ * rpi_stream.h - Raspberry Pi device stream abstraction class.\n+ */\n+#ifndef __LIBCAMERA_PIPELINE_RPI_STREAM_H__\n+#define __LIBCAMERA_PIPELINE_RPI_STREAM_H__\n+\n+#include \n+#include \n+#include \n+\n+#include \n+\n+#include \"libcamera/internal/v4l2_videodevice.h\"\n+\n+namespace libcamera {\n+\n+namespace RPi {\n+\n+/*\n+ * Device stream abstraction for either an internal or external stream.\n+ * Used for both Unicam and the ISP.\n+ */\n+class RPiStream : public Stream\n+{\n+public:\n+\tRPiStream()\n+\t{\n+\t}\n+\n+\tRPiStream(const char *name, MediaEntity *dev, bool importOnly = false)\n+\t\t: external_(false), importOnly_(importOnly), name_(name),\n+\t\t dev_(std::make_unique(dev))\n+\t{\n+\t}\n+\n+\tV4L2VideoDevice *dev() const;\n+\tstd::string name() const;\n+\tbool isImporter() const;\n+\tvoid reset();\n+\n+\tvoid setExternal(bool external);\n+\tbool isExternal() const;\n+\n+\tvoid setExternalBuffers(std::vector> *buffers);\n+\tconst std::vector> *getBuffers() const;\n+\tbool findFrameBuffer(FrameBuffer *buffer) const;\n+\n+\tint importBuffers(unsigned int count);\n+\tint allocateBuffers(unsigned int count);\n+\n+\tint queueBuffers();\n+\tvoid releaseBuffers();\n+\n+private:\n+\t/*\n+\t * Indicates that this stream is active externally, i.e. the buffers\n+\t * are provided by 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+\n+\t/* Stream name identifier. */\n+\tstd::string name_;\n+\n+\t/* The actual device stream. */\n+\tstd::unique_ptr dev_;\n+\n+\t/* Internally allocated framebuffers associated with this device stream. */\n+\tstd::vector> internalBuffers_;\n+\n+\t/* Externally allocated framebuffers associated with this device stream. */\n+\tstd::vector> *externalBuffers_;\n+};\n+\n+/*\n+ * The following class is just a convenient (and typesafe) array of device\n+ * streams indexed with an enum class.\n+ */\n+template\n+class RPiDevice : public std::array\n+{\n+private:\n+\tconstexpr auto index(E e) const noexcept\n+\t{\n+\t\treturn static_cast>(e);\n+\t}\n+public:\n+\tRPiStream &operator[](E e)\n+\t{\n+\t\treturn std::array::operator[](index(e));\n+\t}\n+\tconst RPiStream &operator[](E e) const\n+\t{\n+\t\treturn std::array::operator[](index(e));\n+\t}\n+};\n+\n+} /* namespace RPi */\n+\n+} /* namespace libcamera */\n+\n+#endif /* __LIBCAMERA_PIPELINE_RPI_STREAM_H__ */\n","prefixes":["libcamera-devel","v6","01/12"]}