From patchwork Wed Sep 2 13:08:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jacopo Mondi X-Patchwork-Id: 9455 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 55773BF019 for ; Wed, 2 Sep 2020 13:05:13 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 2EC8B62931; Wed, 2 Sep 2020 15:05:13 +0200 (CEST) Received: from relay11.mail.gandi.net (relay11.mail.gandi.net [217.70.178.231]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 5D12C628EE for ; Wed, 2 Sep 2020 15:05:11 +0200 (CEST) Received: from uno.lan (93-34-118-233.ip49.fastwebnet.it [93.34.118.233]) (Authenticated sender: jacopo@jmondi.org) by relay11.mail.gandi.net (Postfix) with ESMTPSA id 4A32B100006; Wed, 2 Sep 2020 13:05:09 +0000 (UTC) From: Jacopo Mondi To: libcamera-devel@lists.libcamera.org Date: Wed, 2 Sep 2020 15:08:41 +0200 Message-Id: <20200902130846.55910-3-jacopo@jmondi.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200902130846.55910-1-jacopo@jmondi.org> References: <20200902130846.55910-1-jacopo@jmondi.org> MIME-Version: 1.0 Subject: [libcamera-devel] [RFC 2/7] android: camera_device: Get rid of stream counter 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: , Cc: tfiga@google.com, hiroh@google.com Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" Now that CameraConfiguration::addConfiguration() returns the index of the newly added configuration, there's no need to use a custom counter to keep track of the StreamConfiguration index associated with a CameraStream. Signed-off-by: Jacopo Mondi Reviewed-by: Kieran Bingham Reviewed-by: Niklas Söderlund --- src/android/camera_device.cpp | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp index 181fca83988d..5a70db832aa5 100644 --- a/src/android/camera_device.cpp +++ b/src/android/camera_device.cpp @@ -1195,12 +1195,6 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list) streams_.clear(); streams_.reserve(stream_list->num_streams); - /* - * Track actually created streams, as there may not be a 1:1 mapping of - * camera3 streams to libcamera streams. - */ - unsigned int streamIndex = 0; - /* First handle all non-MJPEG streams. */ for (unsigned int i = 0; i < stream_list->num_streams; ++i) { camera3_stream_t *stream = stream_list->streams[i]; @@ -1230,9 +1224,7 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list) streamConfiguration.size = size; streamConfiguration.pixelFormat = format; - config_->addConfiguration(streamConfiguration); - - streams_[i].index = streamIndex++; + streams_[i].index = config_->addConfiguration(streamConfiguration); } /* Now handle MJPEG streams, adding a new stream if required. */ @@ -1280,8 +1272,7 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list) LOG(HAL, Info) << "Adding " << streamConfiguration.toString() << " for MJPEG support"; - config_->addConfiguration(streamConfiguration); - streams_[i].index = streamIndex++; + streams_[i].index = config_->addConfiguration(streamConfiguration); } }