[{"id":15361,"web_url":"https://patchwork.libcamera.org/comment/15361/","msgid":"","date":"2021-03-01T20:24:34","subject":"Re: [libcamera-devel] [PATCH 10/20] libcamera: pipeline: simple:\n\tStore streams in a vector","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi Laurent,\n\nOn 31/01/2021 22:46, Laurent Pinchart wrote:\n> To prepare for multiple streams support, store the streams in a vector\n> in the SimpleCameraData class.\n\nIt's not clear from this patch or description /why/ a vector is better\nthan a set yet ... So I assume that will be evident ... soon ? \n\nStill, given that this patch changes from a set to a vector, and\nassuming we're about to find out the actual reason why it's required:\n\nReviewed-by: Kieran Bingham \n\nI presume it's so they can be indexed by ... an index ?\n\n\n> Signed-off-by: Laurent Pinchart \n> ---\n> src/libcamera/pipeline/simple/simple.cpp | 19 ++++++++++++-------\n> 1 file changed, 12 insertions(+), 7 deletions(-)\n> \n> diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp\n> index b7a890ab772e..390c87ba74d8 100644\n> --- a/src/libcamera/pipeline/simple/simple.cpp\n> +++ b/src/libcamera/pipeline/simple/simple.cpp\n> @@ -61,7 +61,6 @@ public:\n> \tSimpleCameraData(SimplePipelineHandler *pipe, MediaEntity *sensor);\n> \n> \tbool isValid() const { return sensor_ != nullptr; }\n> -\tstd::set streams() { return { &stream_ }; }\n> \n> \tint init();\n> \tint setupLinks();\n> @@ -80,7 +79,7 @@ public:\n> \t\tSizeRange outputSizes;\n> \t};\n> \n> -\tStream stream_;\n> +\tstd::vector streams_;\n> \tstd::unique_ptr sensor_;\n> \tstd::list entities_;\n> \tV4L2VideoDevice *video_;\n> @@ -169,6 +168,8 @@ SimpleCameraData::SimpleCameraData(SimplePipelineHandler *pipe,\n> {\n> \tint ret;\n> \n> +\tstreams_.resize(1);\n> +\n> \t/*\n> \t * Walk the pipeline towards the video node and store all entities\n> \t * along the way.\n> @@ -620,7 +621,7 @@ int SimplePipelineHandler::configure(Camera *camera, CameraConfiguration *c)\n> \t\tLOG(SimplePipeline, Debug) << \"Using format converter\";\n> \t}\n> \n> -\tcfg.setStream(&data->stream_);\n> +\tcfg.setStream(&data->streams_[0]);\n> \n> \treturn 0;\n> }\n> @@ -645,7 +646,7 @@ int SimplePipelineHandler::start(Camera *camera, [[maybe_unused]] ControlList *c\n> {\n> \tSimpleCameraData *data = cameraData(camera);\n> \tV4L2VideoDevice *video = data->video_;\n> -\tunsigned int count = data->stream_.configuration().bufferCount;\n> +\tunsigned int count = data->streams_[0].configuration().bufferCount;\n> \tint ret;\n> \n> \tif (useConverter_)\n> @@ -696,7 +697,7 @@ void SimplePipelineHandler::stop(Camera *camera)\n> int SimplePipelineHandler::queueRequestDevice(Camera *camera, Request *request)\n> {\n> \tSimpleCameraData *data = cameraData(camera);\n> -\tStream *stream = &data->stream_;\n> +\tStream *stream = &data->streams_[0];\n> \n> \tFrameBuffer *buffer = request->findBuffer(stream);\n> \tif (!buffer) {\n> @@ -825,9 +826,13 @@ bool SimplePipelineHandler::match(DeviceEnumerator *enumerator)\n> \t\tif (ret < 0)\n> \t\t\tcontinue;\n> \n> +\t\tstd::set streams;\n> +\t\tstd::transform(data->streams_.begin(), data->streams_.end(),\n> +\t\t\t std::inserter(streams, streams.end()),\n> +\t\t\t [](Stream &stream) { return &stream; });\n> +\n> \t\tstd::shared_ptr camera =\n> -\t\t\tCamera::create(this, data->sensor_->id(),\n> -\t\t\t\t data->streams());\n> +\t\t\tCamera::create(this, data->sensor_->id(), streams);\n> \t\tregisterCamera(std::move(camera), std::move(data));\n> \t\tregistered = true;\n> \t}\n>","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 CA446BD1F1\n\tfor ;\n\tMon, 1 Mar 2021 20:24:39 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 95E7E60522;\n\tMon, 1 Mar 2021 21:24:39 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 2CA9D60521\n\tfor ;\n\tMon, 1 Mar 2021 21:24:38 +0100 (CET)","from [192.168.0.20]\n\t(cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id B698241;\n\tMon, 1 Mar 2021 21:24:37 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"oswQ9lBU\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1614630277;\n\tbh=JA3fsYqWd4OyZI+oOTZxVfFVdHcxjgEjCHfoD98jkSM=;\n\th=Reply-To:Subject:To:Cc:References:From:Date:In-Reply-To:From;\n\tb=oswQ9lBUoE6bK70CE36x4U+A7/13DoqOognnD2s4q3gTT/VMI9yJoTUndJARDQxck\n\tSP6GbtYLig3PLvSutOGKtx/sPtbhvUumIu+HtpNxiwAPQu8HDno1OfW6hJ8wiOy81t\n\trAbqbtKOTMGvJX6MejDSd6LydFg/exYBATtXVeew=","To":"Laurent Pinchart ,\n\tlibcamera-devel@lists.libcamera.org","References":"<20210131224702.8838-1-laurent.pinchart@ideasonboard.com>\n\t<20210131224702.8838-11-laurent.pinchart@ideasonboard.com>","From":"Kieran Bingham ","Autocrypt":"addr=kieran.bingham@ideasonboard.com; keydata=\n\t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\n\tWZw01QYHU/GUV/zHJSFk","Organization":"Ideas on Board","Message-ID":"","Date":"Mon, 1 Mar 2021 20:24:34 +0000","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101\n\tThunderbird/68.10.0","MIME-Version":"1.0","In-Reply-To":"<20210131224702.8838-11-laurent.pinchart@ideasonboard.com>","Content-Language":"en-GB","Subject":"Re: [libcamera-devel] [PATCH 10/20] libcamera: pipeline: simple:\n\tStore streams in a vector","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","Reply-To":"kieran.bingham@ideasonboard.com","Cc":"Phi-Bang Nguyen ","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":15364,"web_url":"https://patchwork.libcamera.org/comment/15364/","msgid":"","date":"2021-03-01T22:27:21","subject":"Re: [libcamera-devel] [PATCH 10/20] libcamera: pipeline: simple:\n\tStore streams in a vector","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Kieran,\n\nOn Mon, Mar 01, 2021 at 08:24:34PM +0000, Kieran Bingham wrote:\n> On 31/01/2021 22:46, Laurent Pinchart wrote:\n> > To prepare for multiple streams support, store the streams in a vector\n> > in the SimpleCameraData class.\n> \n> It's not clear from this patch or description /why/ a vector is better\n> than a set yet ... So I assume that will be evident ... soon ? onwards>\n> \n> Still, given that this patch changes from a set to a vector, and\n> assuming we're about to find out the actual reason why it's required:\n> \n> Reviewed-by: Kieran Bingham \n> \n> I presume it's so they can be indexed by ... an index ?\n\nNote that this patch doesn't switch from storing streams from a set to a\nvector. There's a single stream instance stored in\nSimpleCameraData::stream_, and the patch turns that into a vector. The\nSimpleCameraData::streams() function, which was meant to provide the\nstd::set required to construct the camera, is removed, but\nthat's just a consequence of multi-stream support.\n\n> > Signed-off-by: Laurent Pinchart \n> > ---\n> > src/libcamera/pipeline/simple/simple.cpp | 19 ++++++++++++-------\n> > 1 file changed, 12 insertions(+), 7 deletions(-)\n> > \n> > diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp\n> > index b7a890ab772e..390c87ba74d8 100644\n> > --- a/src/libcamera/pipeline/simple/simple.cpp\n> > +++ b/src/libcamera/pipeline/simple/simple.cpp\n> > @@ -61,7 +61,6 @@ public:\n> > \tSimpleCameraData(SimplePipelineHandler *pipe, MediaEntity *sensor);\n> > \n> > \tbool isValid() const { return sensor_ != nullptr; }\n> > -\tstd::set streams() { return { &stream_ }; }\n> > \n> > \tint init();\n> > \tint setupLinks();\n> > @@ -80,7 +79,7 @@ public:\n> > \t\tSizeRange outputSizes;\n> > \t};\n> > \n> > -\tStream stream_;\n> > +\tstd::vector streams_;\n> > \tstd::unique_ptr sensor_;\n> > \tstd::list entities_;\n> > \tV4L2VideoDevice *video_;\n> > @@ -169,6 +168,8 @@ SimpleCameraData::SimpleCameraData(SimplePipelineHandler *pipe,\n> > {\n> > \tint ret;\n> > \n> > +\tstreams_.resize(1);\n> > +\n> > \t/*\n> > \t * Walk the pipeline towards the video node and store all entities\n> > \t * along the way.\n> > @@ -620,7 +621,7 @@ int SimplePipelineHandler::configure(Camera *camera, CameraConfiguration *c)\n> > \t\tLOG(SimplePipeline, Debug) << \"Using format converter\";\n> > \t}\n> > \n> > -\tcfg.setStream(&data->stream_);\n> > +\tcfg.setStream(&data->streams_[0]);\n> > \n> > \treturn 0;\n> > }\n> > @@ -645,7 +646,7 @@ int SimplePipelineHandler::start(Camera *camera, [[maybe_unused]] ControlList *c\n> > {\n> > \tSimpleCameraData *data = cameraData(camera);\n> > \tV4L2VideoDevice *video = data->video_;\n> > -\tunsigned int count = data->stream_.configuration().bufferCount;\n> > +\tunsigned int count = data->streams_[0].configuration().bufferCount;\n> > \tint ret;\n> > \n> > \tif (useConverter_)\n> > @@ -696,7 +697,7 @@ void SimplePipelineHandler::stop(Camera *camera)\n> > int SimplePipelineHandler::queueRequestDevice(Camera *camera, Request *request)\n> > {\n> > \tSimpleCameraData *data = cameraData(camera);\n> > -\tStream *stream = &data->stream_;\n> > +\tStream *stream = &data->streams_[0];\n> > \n> > \tFrameBuffer *buffer = request->findBuffer(stream);\n> > \tif (!buffer) {\n> > @@ -825,9 +826,13 @@ bool SimplePipelineHandler::match(DeviceEnumerator *enumerator)\n> > \t\tif (ret < 0)\n> > \t\t\tcontinue;\n> > \n> > +\t\tstd::set streams;\n> > +\t\tstd::transform(data->streams_.begin(), data->streams_.end(),\n> > +\t\t\t std::inserter(streams, streams.end()),\n> > +\t\t\t [](Stream &stream) { return &stream; });\n> > +\n> > \t\tstd::shared_ptr camera =\n> > -\t\t\tCamera::create(this, data->sensor_->id(),\n> > -\t\t\t\t data->streams());\n> > +\t\t\tCamera::create(this, data->sensor_->id(), streams);\n> > \t\tregisterCamera(std::move(camera), std::move(data));\n> > \t\tregistered = true;\n> > \t}","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 4D1C0BD808\n\tfor ;\n\tMon, 1 Mar 2021 22:27:51 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id D404C68A7D;\n\tMon, 1 Mar 2021 23:27:50 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 067F160521\n\tfor ;\n\tMon, 1 Mar 2021 23:27:50 +0100 (CET)","from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 5610D332;\n\tMon, 1 Mar 2021 23:27:49 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"B3g39oWB\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1614637669;\n\tbh=oHwlFsg98KpH/Gy4p+YnQQdv0pE3mNoYOj2nz0xyUI4=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=B3g39oWBnnv0gUFjnIDVWTEqwo4NoL9HfIKo2s9XOWrp1QLL7szCiOlUZWCNah56D\n\tbASZ9nZvBbQl/mIu4i37UUHxKBj4z1OZg7eCT5v0uMUETnbSf1U+m3rSm8SYj57ucv\n\t/wivQhBujwvzUMrWq1d2nir7FxmfeuiHrYzTnQEE=","Date":"Tue, 2 Mar 2021 00:27:21 +0200","From":"Laurent Pinchart ","To":"Kieran Bingham ","Message-ID":"","References":"<20210131224702.8838-1-laurent.pinchart@ideasonboard.com>\n\t<20210131224702.8838-11-laurent.pinchart@ideasonboard.com>\n\t","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"","Subject":"Re: [libcamera-devel] [PATCH 10/20] libcamera: pipeline: simple:\n\tStore streams in a vector","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","Cc":"Phi-Bang Nguyen ,\n\tlibcamera-devel@lists.libcamera.org","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":15375,"web_url":"https://patchwork.libcamera.org/comment/15375/","msgid":"<20210302003300.GI3084@pyrite.rasen.tech>","date":"2021-03-02T00:33:00","subject":"Re: [libcamera-devel] [PATCH 10/20] libcamera: pipeline: simple:\n\tStore streams in a vector","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/people/17/","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"content":"Hi Laurent,\n\nOn Mon, Feb 01, 2021 at 12:46:52AM +0200, Laurent Pinchart wrote:\n> To prepare for multiple streams support, store the streams in a vector\n> in the SimpleCameraData class.\n> \n> Signed-off-by: Laurent Pinchart \n\nReviewed-by: Paul Elder \n\n> ---\n> src/libcamera/pipeline/simple/simple.cpp | 19 ++++++++++++-------\n> 1 file changed, 12 insertions(+), 7 deletions(-)\n> \n> diff --git a/src/libcamera/pipeline/simple/simple.cpp b/src/libcamera/pipeline/simple/simple.cpp\n> index b7a890ab772e..390c87ba74d8 100644\n> --- a/src/libcamera/pipeline/simple/simple.cpp\n> +++ b/src/libcamera/pipeline/simple/simple.cpp\n> @@ -61,7 +61,6 @@ public:\n> \tSimpleCameraData(SimplePipelineHandler *pipe, MediaEntity *sensor);\n> \n> \tbool isValid() const { return sensor_ != nullptr; }\n> -\tstd::set streams() { return { &stream_ }; }\n> \n> \tint init();\n> \tint setupLinks();\n> @@ -80,7 +79,7 @@ public:\n> \t\tSizeRange outputSizes;\n> \t};\n> \n> -\tStream stream_;\n> +\tstd::vector streams_;\n> \tstd::unique_ptr sensor_;\n> \tstd::list entities_;\n> \tV4L2VideoDevice *video_;\n> @@ -169,6 +168,8 @@ SimpleCameraData::SimpleCameraData(SimplePipelineHandler *pipe,\n> {\n> \tint ret;\n> \n> +\tstreams_.resize(1);\n> +\n> \t/*\n> \t * Walk the pipeline towards the video node and store all entities\n> \t * along the way.\n> @@ -620,7 +621,7 @@ int SimplePipelineHandler::configure(Camera *camera, CameraConfiguration *c)\n> \t\tLOG(SimplePipeline, Debug) << \"Using format converter\";\n> \t}\n> \n> -\tcfg.setStream(&data->stream_);\n> +\tcfg.setStream(&data->streams_[0]);\n> \n> \treturn 0;\n> }\n> @@ -645,7 +646,7 @@ int SimplePipelineHandler::start(Camera *camera, [[maybe_unused]] ControlList *c\n> {\n> \tSimpleCameraData *data = cameraData(camera);\n> \tV4L2VideoDevice *video = data->video_;\n> -\tunsigned int count = data->stream_.configuration().bufferCount;\n> +\tunsigned int count = data->streams_[0].configuration().bufferCount;\n> \tint ret;\n> \n> \tif (useConverter_)\n> @@ -696,7 +697,7 @@ void SimplePipelineHandler::stop(Camera *camera)\n> int SimplePipelineHandler::queueRequestDevice(Camera *camera, Request *request)\n> {\n> \tSimpleCameraData *data = cameraData(camera);\n> -\tStream *stream = &data->stream_;\n> +\tStream *stream = &data->streams_[0];\n> \n> \tFrameBuffer *buffer = request->findBuffer(stream);\n> \tif (!buffer) {\n> @@ -825,9 +826,13 @@ bool SimplePipelineHandler::match(DeviceEnumerator *enumerator)\n> \t\tif (ret < 0)\n> \t\t\tcontinue;\n> \n> +\t\tstd::set streams;\n> +\t\tstd::transform(data->streams_.begin(), data->streams_.end(),\n> +\t\t\t std::inserter(streams, streams.end()),\n> +\t\t\t [](Stream &stream) { return &stream; });\n> +\n> \t\tstd::shared_ptr camera =\n> -\t\t\tCamera::create(this, data->sensor_->id(),\n> -\t\t\t\t data->streams());\n> +\t\t\tCamera::create(this, data->sensor_->id(), streams);\n> \t\tregisterCamera(std::move(camera), std::move(data));\n> \t\tregistered = true;\n> \t}\n> -- \n> Regards,\n> \n> Laurent Pinchart\n> \n> _______________________________________________\n> libcamera-devel mailing list\n> libcamera-devel@lists.libcamera.org\n> https://lists.libcamera.org/listinfo/libcamera-devel","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 E3AB1BD808\n\tfor ;\n\tTue, 2 Mar 2021 00:33:10 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 738E568A8F;\n\tTue, 2 Mar 2021 01:33:10 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 6DD94602E9\n\tfor ;\n\tTue, 2 Mar 2021 01:33:08 +0100 (CET)","from pyrite.rasen.tech (unknown\n\t[IPv6:2400:4051:61:600:2c71:1b79:d06d:5032])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 8CE5545D;\n\tTue, 2 Mar 2021 01:33:06 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"kvgf7oH1\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1614645188;\n\tbh=Eg09JWM8DAOE8vVOy/oQSy98JdNTM96CStg6mJ/LqT8=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=kvgf7oH1NbbeOvQSdvcW+Xk5k/dRJwDHtRpJq17Y4ucWp7KpQEsrDSiB/4SwZpKXs\n\tDTtwFlRVhnbN+we0lILVuyRjJGsIB0bOeBtdhwJ2r/ZhyspH6/IqmChr1uZodVeprR\n\tLXUtwZFBzeBjbHyKF2+kRcFluaXxv629Vmcd7bVU=","Date":"Tue, 2 Mar 2021 09:33:00 +0900","From":"paul.elder@ideasonboard.com","To":"Laurent Pinchart ","Message-ID":"<20210302003300.GI3084@pyrite.rasen.tech>","References":"<20210131224702.8838-1-laurent.pinchart@ideasonboard.com>\n\t<20210131224702.8838-11-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20210131224702.8838-11-laurent.pinchart@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH 10/20] libcamera: pipeline: simple:\n\tStore streams in a vector","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","Cc":"Phi-Bang Nguyen ,\n\tlibcamera-devel@lists.libcamera.org","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]