[{"id":30210,"web_url":"https://patchwork.libcamera.org/comment/30210/","msgid":"","date":"2024-07-02T11:52:42","subject":"Re: [PATCH v4 3/4] converter: converter_v4l2_m2m: Rename private\n\tStream class","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/people/17/","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"content":"On Mon, Jun 24, 2024 at 07:18:58PM +0530, Umang Jain wrote:\n> Rename the private Stream class from V4L2M2MConverter::Stream to\n> V4L2M2MConverter::V4L2M2MStream. This is done to improve readability\n> of the code when we drop the handling of stream by indexes in a\n> subsequent patch.\n> \n> Signed-off-by: Umang Jain \n> Reviewed-by: Kieran Bingham \n\nReviewed-by: Paul Elder \n\n> ---\n> .../internal/converter/converter_v4l2_m2m.h | 6 ++--\n> .../converter/converter_v4l2_m2m.cpp | 34 +++++++++----------\n> 2 files changed, 20 insertions(+), 20 deletions(-)\n> \n> diff --git a/include/libcamera/internal/converter/converter_v4l2_m2m.h b/include/libcamera/internal/converter/converter_v4l2_m2m.h\n> index 1126050c..0da62290 100644\n> --- a/include/libcamera/internal/converter/converter_v4l2_m2m.h\n> +++ b/include/libcamera/internal/converter/converter_v4l2_m2m.h\n> @@ -57,10 +57,10 @@ public:\n> \t\t\t const std::map &outputs);\n> \n> private:\n> -\tclass Stream : protected Loggable\n> +\tclass V4L2M2MStream : protected Loggable\n> \t{\n> \tpublic:\n> -\t\tStream(V4L2M2MConverter *converter, unsigned int index);\n> +\t\tV4L2M2MStream(V4L2M2MConverter *converter, unsigned int index);\n> \n> \t\tbool isValid() const { return m2m_ != nullptr; }\n> \n> @@ -91,7 +91,7 @@ private:\n> \n> \tstd::unique_ptr m2m_;\n> \n> -\tstd::vector streams_;\n> +\tstd::vector streams_;\n> \tstd::map queue_;\n> };\n> \n> diff --git a/src/libcamera/converter/converter_v4l2_m2m.cpp b/src/libcamera/converter/converter_v4l2_m2m.cpp\n> index 27a50e34..6309a0c0 100644\n> --- a/src/libcamera/converter/converter_v4l2_m2m.cpp\n> +++ b/src/libcamera/converter/converter_v4l2_m2m.cpp\n> @@ -32,24 +32,24 @@ namespace libcamera {\n> LOG_DECLARE_CATEGORY(Converter)\n> \n> /* -----------------------------------------------------------------------------\n> - * V4L2M2MConverter::Stream\n> + * V4L2M2MConverter::V4L2M2MStream\n> */\n> \n> -V4L2M2MConverter::Stream::Stream(V4L2M2MConverter *converter, unsigned int index)\n> +V4L2M2MConverter::V4L2M2MStream::V4L2M2MStream(V4L2M2MConverter *converter, unsigned int index)\n> \t: converter_(converter), index_(index)\n> {\n> \tm2m_ = std::make_unique(converter->deviceNode());\n> \n> -\tm2m_->output()->bufferReady.connect(this, &Stream::outputBufferReady);\n> -\tm2m_->capture()->bufferReady.connect(this, &Stream::captureBufferReady);\n> +\tm2m_->output()->bufferReady.connect(this, &V4L2M2MStream::outputBufferReady);\n> +\tm2m_->capture()->bufferReady.connect(this, &V4L2M2MStream::captureBufferReady);\n> \n> \tint ret = m2m_->open();\n> \tif (ret < 0)\n> \t\tm2m_.reset();\n> }\n> \n> -int V4L2M2MConverter::Stream::configure(const StreamConfiguration &inputCfg,\n> -\t\t\t\t\tconst StreamConfiguration &outputCfg)\n> +int V4L2M2MConverter::V4L2M2MStream::configure(const StreamConfiguration &inputCfg,\n> +\t\t\t\t\t const StreamConfiguration &outputCfg)\n> {\n> \tV4L2PixelFormat videoFormat =\n> \t\tm2m_->output()->toV4L2PixelFormat(inputCfg.pixelFormat);\n> @@ -101,13 +101,13 @@ int V4L2M2MConverter::Stream::configure(const StreamConfiguration &inputCfg,\n> \treturn 0;\n> }\n> \n> -int V4L2M2MConverter::Stream::exportBuffers(unsigned int count,\n> -\t\t\t\t\t std::vector> *buffers)\n> +int V4L2M2MConverter::V4L2M2MStream::exportBuffers(unsigned int count,\n> +\t\t\t\t\t\t std::vector> *buffers)\n> {\n> \treturn m2m_->capture()->exportBuffers(count, buffers);\n> }\n> \n> -int V4L2M2MConverter::Stream::start()\n> +int V4L2M2MConverter::V4L2M2MStream::start()\n> {\n> \tint ret = m2m_->output()->importBuffers(inputBufferCount_);\n> \tif (ret < 0)\n> @@ -134,7 +134,7 @@ int V4L2M2MConverter::Stream::start()\n> \treturn 0;\n> }\n> \n> -void V4L2M2MConverter::Stream::stop()\n> +void V4L2M2MConverter::V4L2M2MStream::stop()\n> {\n> \tm2m_->capture()->streamOff();\n> \tm2m_->output()->streamOff();\n> @@ -142,7 +142,7 @@ void V4L2M2MConverter::Stream::stop()\n> \tm2m_->output()->releaseBuffers();\n> }\n> \n> -int V4L2M2MConverter::Stream::queueBuffers(FrameBuffer *input, FrameBuffer *output)\n> +int V4L2M2MConverter::V4L2M2MStream::queueBuffers(FrameBuffer *input, FrameBuffer *output)\n> {\n> \tint ret = m2m_->output()->queueBuffer(input);\n> \tif (ret < 0)\n> @@ -155,12 +155,12 @@ int V4L2M2MConverter::Stream::queueBuffers(FrameBuffer *input, FrameBuffer *outp\n> \treturn 0;\n> }\n> \n> -std::string V4L2M2MConverter::Stream::logPrefix() const\n> +std::string V4L2M2MConverter::V4L2M2MStream::logPrefix() const\n> {\n> \treturn \"stream\" + std::to_string(index_);\n> }\n> \n> -void V4L2M2MConverter::Stream::outputBufferReady(FrameBuffer *buffer)\n> +void V4L2M2MConverter::V4L2M2MStream::outputBufferReady(FrameBuffer *buffer)\n> {\n> \tauto it = converter_->queue_.find(buffer);\n> \tif (it == converter_->queue_.end())\n> @@ -172,7 +172,7 @@ void V4L2M2MConverter::Stream::outputBufferReady(FrameBuffer *buffer)\n> \t}\n> }\n> \n> -void V4L2M2MConverter::Stream::captureBufferReady(FrameBuffer *buffer)\n> +void V4L2M2MConverter::V4L2M2MStream::captureBufferReady(FrameBuffer *buffer)\n> {\n> \tconverter_->outputBufferReady.emit(buffer);\n> }\n> @@ -336,7 +336,7 @@ int V4L2M2MConverter::configure(const StreamConfiguration &inputCfg,\n> \tstreams_.reserve(outputCfgs.size());\n> \n> \tfor (unsigned int i = 0; i < outputCfgs.size(); ++i) {\n> -\t\tStream &stream = streams_.emplace_back(this, i);\n> +\t\tV4L2M2MStream &stream = streams_.emplace_back(this, i);\n> \n> \t\tif (!stream.isValid()) {\n> \t\t\tLOG(Converter, Error)\n> @@ -377,7 +377,7 @@ int V4L2M2MConverter::start()\n> {\n> \tint ret;\n> \n> -\tfor (Stream &stream : streams_) {\n> +\tfor (V4L2M2MStream &stream : streams_) {\n> \t\tret = stream.start();\n> \t\tif (ret < 0) {\n> \t\t\tstop();\n> @@ -393,7 +393,7 @@ int V4L2M2MConverter::start()\n> */\n> void V4L2M2MConverter::stop()\n> {\n> -\tfor (Stream &stream : utils::reverse(streams_))\n> +\tfor (V4L2M2MStream &stream : utils::reverse(streams_))\n> \t\tstream.stop();\n> }\n> \n> -- \n> 2.44.0\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 39E6ABEFBE\n\tfor ;\n\tTue, 2 Jul 2024 11:52:50 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id E2FA262E26;\n\tTue, 2 Jul 2024 13:52:49 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id B2B4462E22\n\tfor ;\n\tTue, 2 Jul 2024 13:52:48 +0200 (CEST)","from pyrite.rasen.tech (h175-177-049-156.catv02.itscom.jp\n\t[175.177.49.156])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 4FF83664;\n\tTue, 2 Jul 2024 13:52:20 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"Ethtps+t\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1719921141;\n\tbh=OEf53yiVhOqSDWT/qqfYK8TFGKWyJAjxmpzxJ2uRo8A=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=Ethtps+tEobeaL+OaYF9ZVVDEDiko3Yoiy3i37Bvf7Lef9knFGsDkwtJOaHHe27lD\n\tWzSU2Da4dEfSpNGBVrHltiB3iW4q2Kqyl4hW4d6O4QOGnjiEhGvOn7EGCSZVuCtJvt\n\tMkH5zxStx4uIc0xN9ugGkaNX59An9Lut9xD3kGpk=","Date":"Tue, 2 Jul 2024 20:52:42 +0900","From":"Paul Elder ","To":"Umang Jain ","Cc":"libcamera-devel@lists.libcamera.org,\n\tKieran Bingham ","Subject":"Re: [PATCH v4 3/4] converter: converter_v4l2_m2m: Rename private\n\tStream class","Message-ID":"","References":"<20240624134859.171969-1-umang.jain@ideasonboard.com>\n\t<20240624134859.171969-4-umang.jain@ideasonboard.com>","MIME-Version":"1.0","Content-Type":"text/plain; charset=us-ascii","Content-Disposition":"inline","In-Reply-To":"<20240624134859.171969-4-umang.jain@ideasonboard.com>","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","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]