[{"id":20135,"web_url":"https://patchwork.libcamera.org/comment/20135/","msgid":"<163403672927.2943484.15724629040887752815@Monstersaurus>","date":"2021-10-12T11:05:29","subject":"Re: [libcamera-devel] [PATCH 1/3] cam: Rename\n\tCameraSession::streamName_ to streamNames_","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Quoting Laurent Pinchart (2021-10-12 03:23:19)\n> The streamName_ map contains names for all streams, rename it to\n> streamNames_ to make this more explicit.\n> \n> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\n\nReviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n\n> ---\n>  src/cam/camera_session.cpp | 8 ++++----\n>  src/cam/camera_session.h   | 2 +-\n>  2 files changed, 5 insertions(+), 5 deletions(-)\n> \n> diff --git a/src/cam/camera_session.cpp b/src/cam/camera_session.cpp\n> index 32a373a99b72..5a25baab03f5 100644\n> --- a/src/cam/camera_session.cpp\n> +++ b/src/cam/camera_session.cpp\n> @@ -177,11 +177,11 @@ int CameraSession::start()\n>                 return ret;\n>         }\n>  \n> -       streamName_.clear();\n> +       streamNames_.clear();\n>         for (unsigned int index = 0; index < config_->size(); ++index) {\n>                 StreamConfiguration &cfg = config_->at(index);\n> -               streamName_[cfg.stream()] = \"cam\" + std::to_string(cameraIndex_)\n> -                                         + \"-stream\" + std::to_string(index);\n> +               streamNames_[cfg.stream()] = \"cam\" + std::to_string(cameraIndex_)\n> +                                          + \"-stream\" + std::to_string(index);\n>         }\n>  \n>         camera_->requestCompleted.connect(this, &CameraSession::requestComplete);\n> @@ -369,7 +369,7 @@ void CameraSession::processRequest(Request *request)\n>  \n>                 const FrameMetadata &metadata = buffer->metadata();\n>  \n> -               info << \" \" << streamName_[stream]\n> +               info << \" \" << streamNames_[stream]\n>                      << \" seq: \" << std::setw(6) << std::setfill('0') << metadata.sequence\n>                      << \" bytesused: \";\n>  \n> diff --git a/src/cam/camera_session.h b/src/cam/camera_session.h\n> index 2ccc71977a99..a7f92d61307e 100644\n> --- a/src/cam/camera_session.h\n> +++ b/src/cam/camera_session.h\n> @@ -60,7 +60,7 @@ private:\n>         std::shared_ptr<libcamera::Camera> camera_;\n>         std::unique_ptr<libcamera::CameraConfiguration> config_;\n>  \n> -       std::map<const libcamera::Stream *, std::string> streamName_;\n> +       std::map<const libcamera::Stream *, std::string> streamNames_;\n>         std::unique_ptr<FrameSink> sink_;\n>         unsigned int cameraIndex_;\n>  \n> -- \n> Regards,\n> \n> Laurent Pinchart\n>","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 06236BDC71\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 12 Oct 2021 11:05:34 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 81C9668F4F;\n\tTue, 12 Oct 2021 13:05:33 +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 3C8D668F4C\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 12 Oct 2021 13:05:32 +0200 (CEST)","from pendragon.ideasonboard.com\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 BF75EE7;\n\tTue, 12 Oct 2021 13:05:31 +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=\"ZvfERNlR\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1634036731;\n\tbh=u2dCdzW+MuG57+WqqpsnAsVabm3thp7nz7TkhPHH6sU=;\n\th=In-Reply-To:References:Subject:From:To:Date:From;\n\tb=ZvfERNlRIBOyyp8WRI3BW/7IJDGg7wB5f/UpuUxvFlkeYDXvaZgGfW2iRMPBo8ttD\n\tuJwDKicrJcVtU0dn3877VCgbqkORxlBPMNDyv7KzYA/c6SV5255bNy0hajhXgVfIt3\n\tKIfe4ZE9mwJ2qHDGBg381pL60YmeC/g9DflvKx64=","Content-Type":"text/plain; charset=\"utf-8\"","MIME-Version":"1.0","Content-Transfer-Encoding":"quoted-printable","In-Reply-To":"<20211012022321.27034-2-laurent.pinchart@ideasonboard.com>","References":"<20211012022321.27034-1-laurent.pinchart@ideasonboard.com>\n\t<20211012022321.27034-2-laurent.pinchart@ideasonboard.com>","From":"Kieran Bingham <kieran.bingham@ideasonboard.com>","To":"Laurent Pinchart <laurent.pinchart@ideasonboard.com>,\n\tlibcamera-devel@lists.libcamera.org","Date":"Tue, 12 Oct 2021 12:05:29 +0100","Message-ID":"<163403672927.2943484.15724629040887752815@Monstersaurus>","User-Agent":"alot/0.9.1","Subject":"Re: [libcamera-devel] [PATCH 1/3] cam: Rename\n\tCameraSession::streamName_ to streamNames_","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>","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>"}}]