{"id":9455,"url":"https://patchwork.libcamera.org/api/patches/9455/?format=json","web_url":"https://patchwork.libcamera.org/patch/9455/","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":"<20200902130846.55910-3-jacopo@jmondi.org>","date":"2020-09-02T13:08:41","name":"[libcamera-devel,RFC,2/7] android: camera_device: Get rid of stream counter","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"a160a705e2b3fe03a7913d7ce4042c29a30ea746","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/9455/mbox/","series":[{"id":1258,"url":"https://patchwork.libcamera.org/api/series/1258/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1258","date":"2020-09-02T13:08:39","name":"android: camera_device: Turn CameraStream into a class","version":1,"mbox":"https://patchwork.libcamera.org/series/1258/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/9455/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/9455/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 55773BF019\n\tfor ;\n\tWed, 2 Sep 2020 13:05:13 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 2EC8B62931;\n\tWed, 2 Sep 2020 15:05:13 +0200 (CEST)","from relay11.mail.gandi.net (relay11.mail.gandi.net\n\t[217.70.178.231])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 5D12C628EE\n\tfor ;\n\tWed, 2 Sep 2020 15:05:11 +0200 (CEST)","from uno.lan (93-34-118-233.ip49.fastwebnet.it [93.34.118.233])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay11.mail.gandi.net (Postfix) with ESMTPSA id 4A32B100006;\n\tWed, 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\n\tstream counter","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","Cc":"tfiga@google.com, hiroh@google.com","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Now that CameraConfiguration::addConfiguration() returns the index\nof the newly added configuration, there's no need to use a custom\ncounter to keep track of the StreamConfiguration index associated with\na CameraStream.\n\nSigned-off-by: Jacopo Mondi \n---\n src/android/camera_device.cpp | 13 ++-----------\n 1 file changed, 2 insertions(+), 11 deletions(-)","diff":"diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 181fca83988d..5a70db832aa5 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -1195,12 +1195,6 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n \tstreams_.clear();\n \tstreams_.reserve(stream_list->num_streams);\n \n-\t/*\n-\t * Track actually created streams, as there may not be a 1:1 mapping of\n-\t * camera3 streams to libcamera streams.\n-\t */\n-\tunsigned int streamIndex = 0;\n-\n \t/* First handle all non-MJPEG streams. */\n \tfor (unsigned int i = 0; i < stream_list->num_streams; ++i) {\n \t\tcamera3_stream_t *stream = stream_list->streams[i];\n@@ -1230,9 +1224,7 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n \t\tstreamConfiguration.size = size;\n \t\tstreamConfiguration.pixelFormat = format;\n \n-\t\tconfig_->addConfiguration(streamConfiguration);\n-\n-\t\tstreams_[i].index = streamIndex++;\n+\t\tstreams_[i].index = config_->addConfiguration(streamConfiguration);\n \t}\n \n \t/* Now handle MJPEG streams, adding a new stream if required. */\n@@ -1280,8 +1272,7 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n \t\t\tLOG(HAL, Info) << \"Adding \" << streamConfiguration.toString()\n \t\t\t\t << \" for MJPEG support\";\n \n-\t\t\tconfig_->addConfiguration(streamConfiguration);\n-\t\t\tstreams_[i].index = streamIndex++;\n+\t\t\tstreams_[i].index = config_->addConfiguration(streamConfiguration);\n \t\t}\n \t}\n \n","prefixes":["libcamera-devel","RFC","2/7"]}