[{"id":29694,"web_url":"https://patchwork.libcamera.org/comment/29694/","msgid":"<171715465440.1000377.12083105154283235584@ping.linuxembedded.co.uk>","date":"2024-05-31T11:24:14","subject":"Re: [PATCH v3 3/4] converter: converter_v4l2_m2m: Rename private\n\tStream class","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Quoting Umang Jain (2024-05-31 06:25:04)\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\nLooks like I already gave this on v3. I don't expect there are any other\nimpacting changes here so I believe it still holds:\n\nReviewed-by: Kieran Bingham \n\n> Signed-off-by: Umang Jain \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> const std::map &outputs);\n> \n> private:\n> - class Stream : protected Loggable\n> + class V4L2M2MStream : protected Loggable\n> {\n> public:\n> - Stream(V4L2M2MConverter *converter, unsigned int index);\n> + V4L2M2MStream(V4L2M2MConverter *converter, unsigned int index);\n> \n> bool isValid() const { return m2m_ != nullptr; }\n> \n> @@ -91,7 +91,7 @@ private:\n> \n> std::unique_ptr m2m_;\n> \n> - std::vector streams_;\n> + std::vector streams_;\n> std::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> : converter_(converter), index_(index)\n> {\n> m2m_ = std::make_unique(converter->deviceNode());\n> \n> - m2m_->output()->bufferReady.connect(this, &Stream::outputBufferReady);\n> - m2m_->capture()->bufferReady.connect(this, &Stream::captureBufferReady);\n> + m2m_->output()->bufferReady.connect(this, &V4L2M2MStream::outputBufferReady);\n> + m2m_->capture()->bufferReady.connect(this, &V4L2M2MStream::captureBufferReady);\n> \n> int ret = m2m_->open();\n> if (ret < 0)\n> m2m_.reset();\n> }\n> \n> -int V4L2M2MConverter::Stream::configure(const StreamConfiguration &inputCfg,\n> - const StreamConfiguration &outputCfg)\n> +int V4L2M2MConverter::V4L2M2MStream::configure(const StreamConfiguration &inputCfg,\n> + const StreamConfiguration &outputCfg)\n> {\n> V4L2PixelFormat videoFormat =\n> m2m_->output()->toV4L2PixelFormat(inputCfg.pixelFormat);\n> @@ -101,13 +101,13 @@ int V4L2M2MConverter::Stream::configure(const StreamConfiguration &inputCfg,\n> return 0;\n> }\n> \n> -int V4L2M2MConverter::Stream::exportBuffers(unsigned int count,\n> - std::vector> *buffers)\n> +int V4L2M2MConverter::V4L2M2MStream::exportBuffers(unsigned int count,\n> + std::vector> *buffers)\n> {\n> return m2m_->capture()->exportBuffers(count, buffers);\n> }\n> \n> -int V4L2M2MConverter::Stream::start()\n> +int V4L2M2MConverter::V4L2M2MStream::start()\n> {\n> int ret = m2m_->output()->importBuffers(inputBufferCount_);\n> if (ret < 0)\n> @@ -134,7 +134,7 @@ int V4L2M2MConverter::Stream::start()\n> return 0;\n> }\n> \n> -void V4L2M2MConverter::Stream::stop()\n> +void V4L2M2MConverter::V4L2M2MStream::stop()\n> {\n> m2m_->capture()->streamOff();\n> m2m_->output()->streamOff();\n> @@ -142,7 +142,7 @@ void V4L2M2MConverter::Stream::stop()\n> m2m_->output()->releaseBuffers();\n> }\n> \n> -int V4L2M2MConverter::Stream::queueBuffers(FrameBuffer *input, FrameBuffer *output)\n> +int V4L2M2MConverter::V4L2M2MStream::queueBuffers(FrameBuffer *input, FrameBuffer *output)\n> {\n> int ret = m2m_->output()->queueBuffer(input);\n> if (ret < 0)\n> @@ -155,12 +155,12 @@ int V4L2M2MConverter::Stream::queueBuffers(FrameBuffer *input, FrameBuffer *outp\n> return 0;\n> }\n> \n> -std::string V4L2M2MConverter::Stream::logPrefix() const\n> +std::string V4L2M2MConverter::V4L2M2MStream::logPrefix() const\n> {\n> return \"stream\" + std::to_string(index_);\n> }\n> \n> -void V4L2M2MConverter::Stream::outputBufferReady(FrameBuffer *buffer)\n> +void V4L2M2MConverter::V4L2M2MStream::outputBufferReady(FrameBuffer *buffer)\n> {\n> auto it = converter_->queue_.find(buffer);\n> if (it == converter_->queue_.end())\n> @@ -172,7 +172,7 @@ void V4L2M2MConverter::Stream::outputBufferReady(FrameBuffer *buffer)\n> }\n> }\n> \n> -void V4L2M2MConverter::Stream::captureBufferReady(FrameBuffer *buffer)\n> +void V4L2M2MConverter::V4L2M2MStream::captureBufferReady(FrameBuffer *buffer)\n> {\n> converter_->outputBufferReady.emit(buffer);\n> }\n> @@ -336,7 +336,7 @@ int V4L2M2MConverter::configure(const StreamConfiguration &inputCfg,\n> streams_.reserve(outputCfgs.size());\n> \n> for (unsigned int i = 0; i < outputCfgs.size(); ++i) {\n> - Stream &stream = streams_.emplace_back(this, i);\n> + V4L2M2MStream &stream = streams_.emplace_back(this, i);\n> \n> if (!stream.isValid()) {\n> LOG(Converter, Error)\n> @@ -377,7 +377,7 @@ int V4L2M2MConverter::start()\n> {\n> int ret;\n> \n> - for (Stream &stream : streams_) {\n> + for (V4L2M2MStream &stream : streams_) {\n> ret = stream.start();\n> if (ret < 0) {\n> stop();\n> @@ -393,7 +393,7 @@ int V4L2M2MConverter::start()\n> */\n> void V4L2M2MConverter::stop()\n> {\n> - for (Stream &stream : utils::reverse(streams_))\n> + for (V4L2M2MStream &stream : utils::reverse(streams_))\n> stream.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 7B139BDE6B\n\tfor ;\n\tFri, 31 May 2024 11:24:19 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id A9007634B6;\n\tFri, 31 May 2024 13:24:18 +0200 (CEST)","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 3707861A46\n\tfor ;\n\tFri, 31 May 2024 13:24:17 +0200 (CEST)","from pendragon.ideasonboard.com\n\t(cpc89244-aztw30-2-0-cust6594.18-1.cable.virginm.net [86.31.185.195])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 1E462E22;\n\tFri, 31 May 2024 13:24:12 +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=\"otmLuAHa\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1717154652;\n\tbh=BDaqEv87Tu67iKMgjes6k2uB6v54Yy+9hk/pshakP9I=;\n\th=In-Reply-To:References:Subject:From:Cc:To:Date:From;\n\tb=otmLuAHaCJc7I0Xiqh9swyDp+YMNVKV4QQSbzwX4iZ8vtPbGE+ufMuD0Qqt2pa+yQ\n\tOCD5KOe0Z4ha5VYt0b6pQBHPtEoyZzrxR2OqXjr1FFlpBHrfcxoEIbunPnArQEkzLh\n\tv/qaZQfbqKS5XwbyydtT/0s9bZoQN+546a0XE3V4=","Content-Type":"text/plain; charset=\"utf-8\"","MIME-Version":"1.0","Content-Transfer-Encoding":"quoted-printable","In-Reply-To":"<20240531052505.150921-4-umang.jain@ideasonboard.com>","References":"<20240531052505.150921-1-umang.jain@ideasonboard.com>\n\t<20240531052505.150921-4-umang.jain@ideasonboard.com>","Subject":"Re: [PATCH v3 3/4] converter: converter_v4l2_m2m: Rename private\n\tStream class","From":"Kieran Bingham ","Cc":"Milan Zamazal ,\n\tAndrey Konovalov ,\n\tUmang Jain ","To":"Umang Jain ,\n\tlibcamera-devel@lists.libcamera.org","Date":"Fri, 31 May 2024 12:24:14 +0100","Message-ID":"<171715465440.1000377.12083105154283235584@ping.linuxembedded.co.uk>","User-Agent":"alot/0.10","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\" "}}]