Patch Detail
Show a patch.
GET /api/1.1/patches/8751/?format=api
{ "id": 8751, "url": "https://patchwork.libcamera.org/api/1.1/patches/8751/?format=api", "web_url": "https://patchwork.libcamera.org/patch/8751/", "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": "<20200713084727.232422-2-naush@raspberrypi.com>", "date": "2020-07-13T08:47:20", "name": "[libcamera-devel,1/9] libcamera: pipeline: raspberrypi: Move RPiStream into a separate header", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "b8c2346a3058d15f9cc8fadd79b0ac2550869f7f", "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/8751/mbox/", "series": [ { "id": 1100, "url": "https://patchwork.libcamera.org/api/1.1/series/1100/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=1100", "date": "2020-07-13T08:47:18", "name": "Zero-copy RAW stream work", "version": 1, "mbox": "https://patchwork.libcamera.org/series/1100/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/8751/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/8751/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 6E2E7BD790\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon, 13 Jul 2020 08:48:00 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 36986605BA;\n\tMon, 13 Jul 2020 10:48:00 +0200 (CEST)", "from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com\n\t[IPv6:2a00:1450:4864:20::32c])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 6B3926055F\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 13 Jul 2020 10:47:59 +0200 (CEST)", "by mail-wm1-x32c.google.com with SMTP id f18so12348445wml.3\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 13 Jul 2020 01:47:59 -0700 (PDT)", "from naushir-VirtualBox.patuck.local ([88.97.76.4])\n\tby smtp.gmail.com with ESMTPSA id\n\tg14sm23203357wrm.93.2020.07.13.01.47.57\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tMon, 13 Jul 2020 01:47:57 -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=\"UwL47plZ\"; 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=4x9yj0Ay38Zs+Dv7yZpSnZKHaCbb0rxGoqp9XCIUguY=;\n\tb=UwL47plZcOpvrBtWPDYke/gAyzFPcdnNDbxUYFL+Z+Q3NdT+cdI7asTRfVeuzYiX7l\n\tILVzxqAfp5xZpRSAG4R57F1HREGdusqtjBuZ/84HQI1IBIynXh41J1V1sKIeCw7kVP7B\n\tweQ+oPSbdbo1JkYt5gfRoBu32EQN+RNdMAY6cG2oZ2p8f4sPiYwB69s8yQeBs2W5v2CN\n\tTHxKEOZ+nZueZyZNBHdSYeCJxzaUG/v3t1rfz7dDMpnseh39Hmej3xv83wxclytogCUy\n\tNQ3y3MSdlzxb3oVi3orTBYDKioACHG47GQmce8P7hBJDpomtH7UrXHLitMA638Ua6h0N\n\t3T7w==", "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=4x9yj0Ay38Zs+Dv7yZpSnZKHaCbb0rxGoqp9XCIUguY=;\n\tb=H0VGTtyXYhpCypgn23K4UBrguJQ8NkimIddr5GIN4r6bV0pHIipPtZH5WEkaKB/LNH\n\tW0nlmCFtr4wFN6fM2NKeyk06ifm/vcBT+PksbB1XZBOH0a3y2d663uY5Ol2MWkQ7B2YU\n\tVAA84OhplTDWSj9HmHcfWa8Jrk4ffOvwPl2701w2KQTZ8E8De5RNRqOA1FyJ7R3/5cJG\n\tAw6qmEkL7BuDshjMG9odw4IfXVsM9+OxwVmeJ7yt+Dy1aw3raNCSd3Z5oqiGca7pTQYR\n\tORFJeBh44JVsbeDJqa6tcwvjvgYxYOECds07ycm909E3naXvuSFkLkBfAbmEzjWvWgxo\n\tmo4Q==", "X-Gm-Message-State": "AOAM533w/0auQJ+TI5KP30nhZb4u3yel2gLDfe8EwVV7sD7+n4i27NdN\n\tteMgwWqFbSSfxCVmhrIhFBvMS+JJz/M=", "X-Google-Smtp-Source": "ABdhPJyd66fwglIztn6LJev8rDOr4654DOLwatkYT6Au0ESS2drFZPxXdtJTkNJC7XxaCQoUFYEhXg==", "X-Received": "by 2002:a1c:238d:: with SMTP id\n\tj135mr17407050wmj.71.1594630078522; \n\tMon, 13 Jul 2020 01:47:58 -0700 (PDT)", "From": "Naushir Patuck <naush@raspberrypi.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Mon, 13 Jul 2020 09:47:20 +0100", "Message-Id": "<20200713084727.232422-2-naush@raspberrypi.com>", "X-Mailer": "git-send-email 2.25.1", "In-Reply-To": "<20200713084727.232422-1-naush@raspberrypi.com>", "References": "<20200713084727.232422-1-naush@raspberrypi.com>", "MIME-Version": "1.0", "Subject": "[libcamera-devel] [PATCH 1/9] libcamera: pipeline: raspberrypi:\n\tMove RPiStream into a separate header", "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>", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Put RPiStream into the RPi namespace and add a new log category (RPISTREAM)\n\nSigned-off-by: Naushir Patuck <naush@raspberrypi.com>\n---\n .../pipeline/raspberrypi/raspberrypi.cpp | 189 ++----------------\n .../pipeline/raspberrypi/rpi_stream.h | 182 +++++++++++++++++\n 2 files changed, 199 insertions(+), 172 deletions(-)\n create mode 100644 src/libcamera/pipeline/raspberrypi/rpi_stream.h", "diff": "diff --git a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\nindex a08ad6a8..7bae72f9 100644\n--- a/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n+++ b/src/libcamera/pipeline/raspberrypi/raspberrypi.cpp\n@@ -17,7 +17,6 @@\n #include <libcamera/ipa/raspberrypi.h>\n #include <libcamera/logging.h>\n #include <libcamera/request.h>\n-#include <libcamera/stream.h>\n \n #include <linux/videodev2.h>\n \n@@ -30,6 +29,7 @@\n #include \"libcamera/internal/v4l2_controls.h\"\n #include \"libcamera/internal/v4l2_videodevice.h\"\n \n+#include \"rpi_stream.h\"\n #include \"staggered_ctrl.h\"\n #include \"vcsm.h\"\n \n@@ -121,165 +121,10 @@ V4L2DeviceFormat findBestMode(V4L2PixFmtMap &formatsMap, const Size &req)\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<V4L2VideoDevice>(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<std::unique_ptr<FrameBuffer>> *buffers)\n-\t{\n-\t\texternalBuffers_ = buffers;\n-\t}\n-\n-\tconst std::vector<std::unique_ptr<FrameBuffer>> *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<FrameBuffer> 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<V4L2VideoDevice> dev_;\n-\t/* Internally allocated framebuffers associated with this device stream. */\n-\tstd::vector<std::unique_ptr<FrameBuffer>> internalBuffers_;\n-\t/* Externally allocated framebuffers associated with this device stream. */\n-\tstd::vector<std::unique_ptr<FrameBuffer>> *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<typename E, std::size_t N>\n-class RPiDevice : public std::array<class RPiStream, N>\n-{\n-private:\n-\tconstexpr auto index(E e) const noexcept\n-\t{\n-\t\treturn static_cast<std::underlying_type_t<E>>(e);\n-\t}\n-public:\n-\tRPiStream &operator[](E e)\n-\t{\n-\t\treturn std::array<class RPiStream, N>::operator[](index(e));\n-\t}\n-\tconst RPiStream &operator[](E e) const\n-\t{\n-\t\treturn std::array<class RPiStream, N>::operator[](index(e));\n-\t}\n-};\n+} /* namespace */\n \n class RPiCameraData : public CameraData\n {\n@@ -318,7 +163,7 @@ 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@@ -326,7 +171,7 @@ public:\n \tRPiDevice<Unicam, 2> unicam_;\n \tRPiDevice<Isp, 4> isp_;\n \t/* The vector below is just for convenience when iterating over all streams. */\n-\tstd::vector<RPiStream *> streams_;\n+\tstd::vector<RPi::RPiStream *> streams_;\n \t/* Buffers passed to the IPA. */\n \tstd::vector<IPABuffer> ipaBuffers_;\n \n@@ -782,7 +627,7 @@ int PipelineHandlerRPi::configure(Camera *camera, CameraConfiguration *config)\n int PipelineHandlerRPi::exportFrameBuffers(Camera *camera, Stream *stream,\n \t\t\t\t\t std::vector<std::unique_ptr<FrameBuffer>> *buffers)\n {\n-\tRPiStream *s = static_cast<RPiStream *>(stream);\n+\tRPi::RPiStream *s = static_cast<RPi::RPiStream *>(stream);\n \tunsigned int count = stream->configuration().bufferCount;\n \tint ret = s->dev()->exportBuffers(count, buffers);\n \n@@ -914,14 +759,14 @@ bool PipelineHandlerRPi::match(DeviceEnumerator *enumerator)\n \tstd::unique_ptr<RPiCameraData> data = std::make_unique<RPiCameraData>(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@@ -1070,7 +915,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<const RPiStream *>(s)->isExternal())\n+\t\tif (static_cast<const RPi::RPiStream *>(s)->isExternal())\n \t\t\tmaxBuffers = std::max(maxBuffers, s->configuration().bufferCount);\n \n \tfor (auto const stream : data->streams_) {\n@@ -1271,12 +1116,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@@ -1332,12 +1177,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@@ -1418,7 +1263,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.h b/src/libcamera/pipeline/raspberrypi/rpi_stream.h\nnew file mode 100644\nindex 00000000..ed4f4987\n--- /dev/null\n+++ b/src/libcamera/pipeline/raspberrypi/rpi_stream.h\n@@ -0,0 +1,182 @@\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 <queue>\n+#include <string>\n+#include <vector>\n+\n+#include \"libcamera/internal/v4l2_videodevice.h\"\n+#include <libcamera/stream.h>\n+\n+namespace libcamera {\n+\n+LOG_DEFINE_CATEGORY(RPISTREAM)\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<V4L2VideoDevice>(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<std::unique_ptr<FrameBuffer>> *buffers)\n+\t{\n+\t\texternalBuffers_ = buffers;\n+\t}\n+\n+\tconst std::vector<std::unique_ptr<FrameBuffer>> *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(RPISTREAM, 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<FrameBuffer> 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<V4L2VideoDevice> dev_;\n+\t/* Internally allocated framebuffers associated with this device stream. */\n+\tstd::vector<std::unique_ptr<FrameBuffer>> internalBuffers_;\n+\t/* Externally allocated framebuffers associated with this device stream. */\n+\tstd::vector<std::unique_ptr<FrameBuffer>> *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<typename E, std::size_t N>\n+class RPiDevice : public std::array<class RPiStream, N>\n+{\n+private:\n+\tconstexpr auto index(E e) const noexcept\n+\t{\n+\t\treturn static_cast<std::underlying_type_t<E>>(e);\n+\t}\n+public:\n+\tRPiStream &operator[](E e)\n+\t{\n+\t\treturn std::array<class RPiStream, N>::operator[](index(e));\n+\t}\n+\tconst RPiStream &operator[](E e) const\n+\t{\n+\t\treturn std::array<class RPiStream, N>::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", "1/9" ] }