{"id":14104,"url":"https://patchwork.libcamera.org/api/patches/14104/?format=json","web_url":"https://patchwork.libcamera.org/patch/14104/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20211012022321.27034-2-laurent.pinchart@ideasonboard.com>","date":"2021-10-12T02:23:19","name":"[libcamera-devel,1/3] cam: Rename CameraSession::streamName_ to streamNames_","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"6b3bfc64450c08006059b334be49ad0439d35b39","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/14104/mbox/","series":[{"id":2616,"url":"https://patchwork.libcamera.org/api/series/2616/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2616","date":"2021-10-12T02:23:18","name":"libcamera: Assorted fixes for the cam application","version":1,"mbox":"https://patchwork.libcamera.org/series/2616/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/14104/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/14104/checks/","tags":{},"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 4E2A0C323E\n\tfor ;\n\tTue, 12 Oct 2021 02:23:43 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 07CA168F50;\n\tTue, 12 Oct 2021 04:23:42 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 939CB68F4A\n\tfor ;\n\tTue, 12 Oct 2021 04:23:39 +0200 (CEST)","from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 3595B8C4\n\tfor ;\n\tTue, 12 Oct 2021 04:23:39 +0200 (CEST)"],"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=\"N0fiEqYN\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1634005419;\n\tbh=ectT3bfxbXD9JiDcQ6ugKOzzEXEaKkdahT4iQQSXmUs=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=N0fiEqYNdXr/zPuLIY5sqoqg0MR9Im6e/T0gjFuE/QMg2w0Iuc/O4KHwe33bVvOgt\n\tUUmeqYmU2WxJ/uam2mFmm60QFIyLG0D1bNM+ee2k7KA8H4TJAze3QR542wlwfYZHzd\n\ttZYQ4TJ/aBfAx/DwVxnpvaJaCsZq0rSS+ulojWSE=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Tue, 12 Oct 2021 05:23:19 +0300","Message-Id":"<20211012022321.27034-2-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.32.0","In-Reply-To":"<20211012022321.27034-1-laurent.pinchart@ideasonboard.com>","References":"<20211012022321.27034-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[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":"","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\" "},"content":"The streamName_ map contains names for all streams, rename it to\nstreamNames_ to make this more explicit.\n\nSigned-off-by: Laurent Pinchart \n---\n src/cam/camera_session.cpp | 8 ++++----\n src/cam/camera_session.h | 2 +-\n 2 files changed, 5 insertions(+), 5 deletions(-)","diff":"diff --git a/src/cam/camera_session.cpp b/src/cam/camera_session.cpp\nindex 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 \t\treturn ret;\n \t}\n \n-\tstreamName_.clear();\n+\tstreamNames_.clear();\n \tfor (unsigned int index = 0; index < config_->size(); ++index) {\n \t\tStreamConfiguration &cfg = config_->at(index);\n-\t\tstreamName_[cfg.stream()] = \"cam\" + std::to_string(cameraIndex_)\n-\t\t\t\t\t + \"-stream\" + std::to_string(index);\n+\t\tstreamNames_[cfg.stream()] = \"cam\" + std::to_string(cameraIndex_)\n+\t\t\t\t\t + \"-stream\" + std::to_string(index);\n \t}\n \n \tcamera_->requestCompleted.connect(this, &CameraSession::requestComplete);\n@@ -369,7 +369,7 @@ void CameraSession::processRequest(Request *request)\n \n \t\tconst FrameMetadata &metadata = buffer->metadata();\n \n-\t\tinfo << \" \" << streamName_[stream]\n+\t\tinfo << \" \" << streamNames_[stream]\n \t\t << \" seq: \" << std::setw(6) << std::setfill('0') << metadata.sequence\n \t\t << \" bytesused: \";\n \ndiff --git a/src/cam/camera_session.h b/src/cam/camera_session.h\nindex 2ccc71977a99..a7f92d61307e 100644\n--- a/src/cam/camera_session.h\n+++ b/src/cam/camera_session.h\n@@ -60,7 +60,7 @@ private:\n \tstd::shared_ptr camera_;\n \tstd::unique_ptr config_;\n \n-\tstd::map streamName_;\n+\tstd::map streamNames_;\n \tstd::unique_ptr sink_;\n \tunsigned int cameraIndex_;\n \n","prefixes":["libcamera-devel","1/3"]}