{"id":9586,"url":"https://patchwork.libcamera.org/api/patches/9586/?format=json","web_url":"https://patchwork.libcamera.org/patch/9586/","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":"<20200912101129.12625-7-jacopo@jmondi.org>","date":"2020-09-12T10:11:25","name":"[libcamera-devel,v4,06/10] android: camera_device: Get rid of stream counter","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"6b3c2ddbc7b8acab9d359ee1a1ded72965813a9a","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/9586/mbox/","series":[{"id":1287,"url":"https://patchwork.libcamera.org/api/series/1287/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1287","date":"2020-09-12T10:11:19","name":"android: camera_device: Fix JPEG/RAW sizes","version":4,"mbox":"https://patchwork.libcamera.org/series/1287/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/9586/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/9586/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 A140CC3B5B\n\tfor ;\n\tSat, 12 Sep 2020 10:08:06 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 7F6EA62D5B;\n\tSat, 12 Sep 2020 12:08:06 +0200 (CEST)","from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net\n\t[217.70.183.201])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id D32AB62D27\n\tfor ;\n\tSat, 12 Sep 2020 12:08:04 +0200 (CEST)","from uno.lan (2-224-242-101.ip172.fastwebnet.it [2.224.242.101])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay8-d.mail.gandi.net (Postfix) with ESMTPSA id 2503A1BF204;\n\tSat, 12 Sep 2020 10:08:02 +0000 (UTC)"],"X-Originating-IP":"2.224.242.101","From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Sat, 12 Sep 2020 12:11:25 +0200","Message-Id":"<20200912101129.12625-7-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.28.0","In-Reply-To":"<20200912101129.12625-1-jacopo@jmondi.org>","References":"<20200912101129.12625-1-jacopo@jmondi.org>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v4 06/10] android: camera_device: Get rid\n\tof stream 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":"hanlinchen@chromium.org","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Use the size() method of the CameraConfiguration class to retrieve the\nindex of the StreamConfiguration associated with a CameraStream and get\nrid of the custom counter.\n\nReviewed-by: Niklas Söderlund \nReviewed-by: Hirokazu Honda \nAcked-by: Laurent Pinchart \nReviewed-by: Kieran Bingham \nSigned-off-by: Jacopo Mondi \n---\n src/android/camera_device.cpp | 11 ++---------\n 1 file changed, 2 insertions(+), 9 deletions(-)","diff":"diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 0608d026e4b0..e2c73ff4c4ce 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -1190,12 +1190,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@@ -1226,8 +1220,7 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n \t\tstreamConfiguration.pixelFormat = format;\n \n \t\tconfig_->addConfiguration(streamConfiguration);\n-\n-\t\tstreams_[i].index = streamIndex++;\n+\t\tstreams_[i].index = config_->size() - 1;\n \t}\n \n \t/* Now handle MJPEG streams, adding a new stream if required. */\n@@ -1276,7 +1269,7 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\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_->size() - 1;\n \t\t}\n \t}\n \n","prefixes":["libcamera-devel","v4","06/10"]}