{"id":8561,"url":"https://patchwork.libcamera.org/api/patches/8561/?format=json","web_url":"https://patchwork.libcamera.org/patch/8561/","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":"<20200702213654.2129054-7-kieran.bingham@ideasonboard.com>","date":"2020-07-02T21:36:51","name":"[libcamera-devel,v2,6/9] android: camera_device: Maintain a vector of CameraStream","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"c0f6462a9ae3ae1a71a21c8b4a772f4c8c769bf7","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/?format=json","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/8561/mbox/","series":[{"id":1073,"url":"https://patchwork.libcamera.org/api/series/1073/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1073","date":"2020-07-02T21:36:45","name":"android: Multi-stream support","version":2,"mbox":"https://patchwork.libcamera.org/series/1073/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/8561/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/8561/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 CBAE0C2E69\n\tfor ;\n\tThu, 2 Jul 2020 21:37:08 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 9251B60C63;\n\tThu, 2 Jul 2020 23:37:08 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id E763B60C6A\n\tfor ;\n\tThu, 2 Jul 2020 23:37:04 +0200 (CEST)","from localhost.localdomain\n\t(cpc89242-aztw30-2-0-cust488.18-1.cable.virginm.net [86.31.129.233])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 7F48DA2D;\n\tThu, 2 Jul 2020 23:37:04 +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=\"EKeQA02J\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1593725824;\n\tbh=Op3xfPmu9zC9viajyJSuhKh+b37hgQTgD9fe6U1V+4Q=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=EKeQA02Jv8awaLnj9yhcfCCDE99YS3ySxMNQcNpgMWP8lBsxmKLPCAgRDpISInu0Y\n\tCW8Oys5xocdnFkHEUSV+zmIAu7h+PYNMzSVYr3BnPQI9npKLLh+S5apEbKXMHOMKkj\n\taYn8bHxSzAAkMZEBN/t1maVEL6WHISy6pGM3O2uU=","From":"Kieran Bingham ","To":"libcamera devel ","Date":"Thu, 2 Jul 2020 22:36:51 +0100","Message-Id":"<20200702213654.2129054-7-kieran.bingham@ideasonboard.com>","X-Mailer":"git-send-email 2.25.1","In-Reply-To":"<20200702213654.2129054-1-kieran.bingham@ideasonboard.com>","References":"<20200702213654.2129054-1-kieran.bingham@ideasonboard.com>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v2 6/9] 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=\"us-ascii\"","Content-Transfer-Encoding":"7bit","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 \n---\n src/android/camera_device.cpp | 18 ++++++++++++++++--\n src/android/camera_device.h | 6 ++++++\n 2 files changed, 22 insertions(+), 2 deletions(-)","diff":"diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 77083219d8a1..fc3962dac230 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -952,6 +952,14 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n \t\treturn -EINVAL;\n \t}\n \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@@ -967,6 +975,9 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n \t\tif (!format.isValid())\n \t\t\treturn -EINVAL;\n \n+\t\t/* Maintain internal state of all stream mappings. */\n+\t\tstreams_[i].androidStream = stream;\n+\n \t\tStreamConfiguration streamConfiguration;\n \n \t\tstreamConfiguration.size.width = stream->width;\n@@ -974,6 +985,7 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n \t\tstreamConfiguration.pixelFormat = format;\n \n \t\tconfig_->addConfiguration(streamConfiguration);\n+\t\tstreams_[i].libcameraIndex = streamIndex++;\n \t}\n \n \tswitch (config_->validate()) {\n@@ -991,10 +1003,12 @@ 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+\n+\t\tStreamConfiguration &cfg = config_->at(cameraStream->libcameraIndex);\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 5bd6cf416156..275760f0aa26 100644\n--- a/src/android/camera_device.h\n+++ b/src/android/camera_device.h\n@@ -25,6 +25,11 @@\n \n class CameraMetadata;\n \n+struct CameraStream {\n+\tcamera3_stream *androidStream;\n+\tunsigned int libcameraIndex;\n+};\n+\n class CameraDevice : protected libcamera::Loggable\n {\n public:\n@@ -89,6 +94,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","v2","6/9"]}