From patchwork Tue Oct 12 02:23:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 14104 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 4E2A0C323E for ; Tue, 12 Oct 2021 02:23:43 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 07CA168F50; Tue, 12 Oct 2021 04:23:42 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="N0fiEqYN"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 939CB68F4A for ; Tue, 12 Oct 2021 04:23:39 +0200 (CEST) Received: from pendragon.lan (62-78-145-57.bb.dnainternet.fi [62.78.145.57]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 3595B8C4 for ; Tue, 12 Oct 2021 04:23:39 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1634005419; bh=ectT3bfxbXD9JiDcQ6ugKOzzEXEaKkdahT4iQQSXmUs=; h=From:To:Subject:Date:In-Reply-To:References:From; b=N0fiEqYNdXr/zPuLIY5sqoqg0MR9Im6e/T0gjFuE/QMg2w0Iuc/O4KHwe33bVvOgt UUmeqYmU2WxJ/uam2mFmm60QFIyLG0D1bNM+ee2k7KA8H4TJAze3QR542wlwfYZHzd tZYQ4TJ/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 Subject: [libcamera-devel] [PATCH 1/3] cam: Rename CameraSession::streamName_ to streamNames_ X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" The streamName_ map contains names for all streams, rename it to streamNames_ to make this more explicit. Signed-off-by: Laurent Pinchart Reviewed-by: Kieran Bingham --- src/cam/camera_session.cpp | 8 ++++---- src/cam/camera_session.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/cam/camera_session.cpp b/src/cam/camera_session.cpp index 32a373a99b72..5a25baab03f5 100644 --- a/src/cam/camera_session.cpp +++ b/src/cam/camera_session.cpp @@ -177,11 +177,11 @@ int CameraSession::start() return ret; } - streamName_.clear(); + streamNames_.clear(); for (unsigned int index = 0; index < config_->size(); ++index) { StreamConfiguration &cfg = config_->at(index); - streamName_[cfg.stream()] = "cam" + std::to_string(cameraIndex_) - + "-stream" + std::to_string(index); + streamNames_[cfg.stream()] = "cam" + std::to_string(cameraIndex_) + + "-stream" + std::to_string(index); } camera_->requestCompleted.connect(this, &CameraSession::requestComplete); @@ -369,7 +369,7 @@ void CameraSession::processRequest(Request *request) const FrameMetadata &metadata = buffer->metadata(); - info << " " << streamName_[stream] + info << " " << streamNames_[stream] << " seq: " << std::setw(6) << std::setfill('0') << metadata.sequence << " bytesused: "; diff --git a/src/cam/camera_session.h b/src/cam/camera_session.h index 2ccc71977a99..a7f92d61307e 100644 --- a/src/cam/camera_session.h +++ b/src/cam/camera_session.h @@ -60,7 +60,7 @@ private: std::shared_ptr camera_; std::unique_ptr config_; - std::map streamName_; + std::map streamNames_; std::unique_ptr sink_; unsigned int cameraIndex_;