{"id":8666,"url":"https://patchwork.libcamera.org/api/1.1/patches/8666/?format=json","web_url":"https://patchwork.libcamera.org/patch/8666/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/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":"<20200706230240.2482100-7-kieran.bingham@ideasonboard.com>","date":"2020-07-06T23:02:38","name":"[libcamera-devel,v5,6/8] android: camera_device: Maintain a vector of CameraStream","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"b8ee40fb3dbe60a9414839c0e7e709fb36efcf02","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/1.1/people/4/?format=json","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/8666/mbox/","series":[{"id":1089,"url":"https://patchwork.libcamera.org/api/1.1/series/1089/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1089","date":"2020-07-06T23:02:32","name":"android: Multi-stream support","version":5,"mbox":"https://patchwork.libcamera.org/series/1089/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/8666/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/8666/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 B0D26BD792\n\tfor ;\n\tMon, 6 Jul 2020 23:02:51 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 7CB9F60E8A;\n\tTue, 7 Jul 2020 01:02:51 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id C5DB860E0D\n\tfor ;\n\tTue, 7 Jul 2020 01:02:48 +0200 (CEST)","from Q.local (cpc89242-aztw30-2-0-cust488.18-1.cable.virginm.net\n\t[86.31.129.233])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 4713DAC6;\n\tTue, 7 Jul 2020 01:02:48 +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=\"KnuRSbiA\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1594076568;\n\tbh=cLGX7nA7gV6Ro1W5SB2+kH6vXWqqaZUO6ffVkLKfPyU=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=KnuRSbiAUpUyP/UwXZrF8pYswafBIKVmblRYBdkd/0BmU7oI+ItpqjFU/8U1WJeOl\n\t9EDmWLlhers8Z8PUCBsMyilFQwiFyQ7lRSzf9D9nreZBTiM6ui6ETUURfRGSQYw4WS\n\tdD7WzA6CrscPRHy6/NAXF7BnwAvV5+xeb3qhcHJU=","From":"Kieran Bingham ","To":"libcamera devel ","Date":"Tue, 7 Jul 2020 00:02:38 +0100","Message-Id":"<20200706230240.2482100-7-kieran.bingham@ideasonboard.com>","X-Mailer":"git-send-email 2.25.1","In-Reply-To":"<20200706230240.2482100-1-kieran.bingham@ideasonboard.com>","References":"<20200706230240.2482100-1-kieran.bingham@ideasonboard.com>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v5 6/8] android: camera_device: Maintain a\n\tvector of CameraStream","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","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Introduce a vector storing a CameraStream to track and maintain\nstate between an Android stream (camera3_stream_t) and a libcamera\nStream.\n\nOnly the index of the libcamera stream is stored, to facilitate identifying\nthe correct index for both the StreamConfiguration and Stream vectors.\n\nSigned-off-by: Kieran Bingham \nReviewed-by: Laurent Pinchart \nReviewed-by: Niklas Söderlund \nReviewed-by: Jacopo Mondi \n---\n src/android/camera_device.cpp | 21 +++++++++++++++++++--\n src/android/camera_device.h | 10 ++++++++++\n 2 files changed, 29 insertions(+), 2 deletions(-)","diff":"diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 4e77a92dbea5..6d060e0c40e5 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -952,6 +952,20 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n \t\treturn -EINVAL;\n \t}\n \n+\t/*\n+\t * Clear and remove any existing configuration from previous calls, and\n+\t * ensure the required entries are available without further\n+\t * re-allcoation.\n+\t */\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 \tfor (unsigned int i = 0; i < stream_list->num_streams; ++i) {\n \t\tcamera3_stream_t *stream = stream_list->streams[i];\n \n@@ -974,6 +988,8 @@ 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}\n \n \tswitch (config_->validate()) {\n@@ -991,10 +1007,11 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n \n \tfor (unsigned int i = 0; i < stream_list->num_streams; ++i) {\n \t\tcamera3_stream_t *stream = stream_list->streams[i];\n-\t\tStreamConfiguration &streamConfiguration = config_->at(i);\n+\t\tCameraStream *cameraStream = &streams_[i];\n+\t\tStreamConfiguration &cfg = config_->at(cameraStream->index);\n \n \t\t/* Use the bufferCount confirmed by the validation process. */\n-\t\tstream->max_buffers = streamConfiguration.bufferCount;\n+\t\tstream->max_buffers = cfg.bufferCount;\n \t}\n \n \t/*\ndiff --git a/src/android/camera_device.h b/src/android/camera_device.h\nindex d7834d94f439..d00f617b09a6 100644\n--- a/src/android/camera_device.h\n+++ b/src/android/camera_device.h\n@@ -25,6 +25,15 @@\n \n class CameraMetadata;\n \n+struct CameraStream {\n+\t/*\n+\t * The index of the libcamera StreamConfiguration as added during\n+\t * configureStreams(). A single libcamera Stream may be used to deliver\n+\t * one or more streams to the Android framework.\n+\t */\n+\tunsigned int index;\n+};\n+\n class CameraDevice : protected libcamera::Loggable\n {\n public:\n@@ -90,6 +99,7 @@ private:\n \n \tstd::vector streamConfigurations_;\n \tstd::map formatsMap_;\n+\tstd::vector streams_;\n \n \tint facing_;\n \tint orientation_;\n","prefixes":["libcamera-devel","v5","6/8"]}