[{"id":14166,"web_url":"https://patchwork.libcamera.org/comment/14166/","msgid":"","date":"2020-12-09T10:51:20","subject":"Re: [libcamera-devel] [PATCH v5 2/3] android: camera_device: Use\n\tCamera3StreamConfig in configureStreams()","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi Hiro,\n\nOn 09/12/2020 05:54, Hirokazu Honda wrote:\n> Use the newly introduced Camera3StreamConfig to associate the\n> Android requested streams with the associated StreamConfiguration\n> in a vector of configurations.\n> \n> This change prepares to sort the vector of configuration before using\n> it to configure the Camera and populate the streams_ vector.\n> \n> No functional changes intended.\n> \n> Signed-off-by: Hirokazu Honda \n> Reviewed-by: Jacopo Mondi \n\nReviewed-by: Kieran Bingham \n\n> ---\n> src/android/camera_device.cpp | 52 +++++++++++++++++++++--------------\n> 1 file changed, 31 insertions(+), 21 deletions(-)\n> \n> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> index 09269d95..b7bf3d88 100644\n> --- a/src/android/camera_device.cpp\n> +++ b/src/android/camera_device.cpp\n> @@ -1240,6 +1240,9 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n> \tstreams_.clear();\n> \tstreams_.reserve(stream_list->num_streams);\n> \n> +\tstd::vector streamConfigs;\n> +\tstreamConfigs.reserve(stream_list->num_streams);\n> +\n> \t/* First handle all non-MJPEG streams. */\n> \tcamera3_stream_t *jpegStream = nullptr;\n> \tfor (unsigned int i = 0; i < stream_list->num_streams; ++i) {\n> @@ -1270,14 +1273,12 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n> \t\t\tcontinue;\n> \t\t}\n> \n> -\t\tStreamConfiguration streamConfiguration;\n> -\t\tstreamConfiguration.size = size;\n> -\t\tstreamConfiguration.pixelFormat = format;\n> -\n> -\t\tconfig_->addConfiguration(streamConfiguration);\n> -\t\tstreams_.emplace_back(this, CameraStream::Type::Direct,\n> -\t\t\t\t stream, config_->size() - 1);\n> -\t\tstream->priv = static_cast(&streams_.back());\n> +\t\tCamera3StreamConfig streamConfig;\n> +\t\tstreamConfig.streams = { stream };\n> +\t\tstreamConfig.types = { CameraStream::Type::Direct };\n> +\t\tstreamConfig.config.size = size;\n> +\t\tstreamConfig.config.pixelFormat = format;\n> +\t\tstreamConfigs.push_back(std::move(streamConfig));\n> \t}\n> \n> \t/* Now handle the MJPEG streams, adding a new stream if required. */\n> @@ -1286,9 +1287,8 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n> \t\tint index = -1;\n> \n> \t\t/* Search for a compatible stream in the non-JPEG ones. */\n> -\t\tfor (unsigned int i = 0; i < config_->size(); i++) {\n> -\t\t\tStreamConfiguration &cfg = config_->at(i);\n> -\n> +\t\tfor (size_t i = 0; i < streamConfigs.size(); ++i) {\n> +\t\t\tconst auto &cfg = streamConfigs[i].config;\n> \t\t\t/*\n> \t\t\t * \\todo The PixelFormat must also be compatible with\n> \t\t\t * the encoder.\n> @@ -1310,28 +1310,38 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n> \t\t * introduce a new stream to satisfy the request requirements.\n> \t\t */\n> \t\tif (index < 0) {\n> -\t\t\tStreamConfiguration streamConfiguration;\n> -\n> \t\t\t/*\n> \t\t\t * \\todo The pixelFormat should be a 'best-fit' choice\n> \t\t\t * and may require a validation cycle. This is not yet\n> \t\t\t * handled, and should be considered as part of any\n> \t\t\t * stream configuration reworks.\n> \t\t\t */\n> -\t\t\tstreamConfiguration.size.width = jpegStream->width;\n> -\t\t\tstreamConfiguration.size.height = jpegStream->height;\n> -\t\t\tstreamConfiguration.pixelFormat = formats::NV12;\n> +\t\t\tCamera3StreamConfig streamConfig;\n> +\t\t\tstreamConfig.config.size.width = jpegStream->width;\n> +\t\t\tstreamConfig.config.size.height = jpegStream->height;\n> +\t\t\tstreamConfig.config.pixelFormat = formats::NV12;\n> +\t\t\tstreamConfigs.push_back(std::move(streamConfig));\n> \n> -\t\t\tLOG(HAL, Info) << \"Adding \" << streamConfiguration.toString()\n> +\t\t\tLOG(HAL, Info) << \"Adding \" << streamConfig.config.toString()\n> \t\t\t\t << \" for MJPEG support\";\n> \n> \t\t\ttype = CameraStream::Type::Internal;\n> -\t\t\tconfig_->addConfiguration(streamConfiguration);\n> -\t\t\tindex = config_->size() - 1;\n> +\t\t\tindex = streamConfigs.size() - 1;\n> \t\t}\n> \n> -\t\tstreams_.emplace_back(this, type, jpegStream, index);\n> -\t\tjpegStream->priv = static_cast(&streams_.back());\n> +\t\tstreamConfigs[index].streams.push_back(jpegStream);\n> +\t\tstreamConfigs[index].types.push_back(type);\n> +\t}\n> +\n> +\tfor (const auto &streamConfig : streamConfigs) {\n> +\t\tconfig_->addConfiguration(streamConfig.config);\n> +\t\tfor (size_t i = 0; i < streamConfig.streams.size(); ++i) {\n> +\t\t\tcamera3_stream_t *stream = streamConfig.streams[i];\n> +\t\t\tconst CameraStream::Type type = streamConfig.types[i];\n> +\t\t\tstreams_.emplace_back(this, type,\n> +\t\t\t\t\t stream, config_->size() - 1);\n> +\t\t\tstream->priv = static_cast(&streams_.back());\n> +\t\t}\n> \t}\n> \n> \tswitch (config_->validate()) {\n> --\n> 2.29.2.576.ga3fc446d84-goog\n> _______________________________________________\n> libcamera-devel mailing list\n> libcamera-devel@lists.libcamera.org\n> https://lists.libcamera.org/listinfo/libcamera-devel\n>","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 A72F5BD808\n\tfor ;\n\tWed, 9 Dec 2020 10:51:25 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 3191C67E4D;\n\tWed, 9 Dec 2020 11:51:25 +0100 (CET)","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 EF5C6635C4\n\tfor ;\n\tWed, 9 Dec 2020 11:51:23 +0100 (CET)","from [192.168.0.217]\n\t(cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 6343ADD;\n\tWed, 9 Dec 2020 11:51:23 +0100 (CET)"],"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=\"J2uzc5uc\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1607511083;\n\tbh=MYzr6JkU0k9VwQh8e0mIwAexBsPQvvHaF4KTg3pusx8=;\n\th=Reply-To:Subject:To:References:From:Date:In-Reply-To:From;\n\tb=J2uzc5ucONzgqdRuSlKxfHy3UL7tlnaNvesJd8wNV4YMaJHjofBsUpzATL/4OLON9\n\tz0mRp8NqTpFY4utECYaGYAmwh0m27zMzLK+0CEiSepebpBk+uQCwjOLX7XZldaYtxr\n\tAwZ5QKMxSRTMfzH4rlU43yvk1XgZvw0FmoHdtO00=","To":"Hirokazu Honda , libcamera-devel@lists.libcamera.org","References":"<20201209055410.3232987-1-hiroh@chromium.org>\n\t<20201209055410.3232987-2-hiroh@chromium.org>","From":"Kieran Bingham ","Autocrypt":"addr=kieran.bingham@ideasonboard.com; keydata=\n\t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\n\tWZw01QYHU/GUV/zHJSFk","Organization":"Ideas on Board","Message-ID":"","Date":"Wed, 9 Dec 2020 10:51:20 +0000","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101\n\tThunderbird/68.10.0","MIME-Version":"1.0","In-Reply-To":"<20201209055410.3232987-2-hiroh@chromium.org>","Content-Language":"en-GB","Subject":"Re: [libcamera-devel] [PATCH v5 2/3] android: camera_device: Use\n\tCamera3StreamConfig in configureStreams()","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","Reply-To":"kieran.bingham@ideasonboard.com","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":14170,"web_url":"https://patchwork.libcamera.org/comment/14170/","msgid":"<9ba2f658-5cb5-343e-fdd4-1928100d71c1@uajain.com>","date":"2020-12-09T12:45:10","subject":"Re: [libcamera-devel] [PATCH v5 2/3] android: camera_device: Use\n\tCamera3StreamConfig in configureStreams()","submitter":{"id":1,"url":"https://patchwork.libcamera.org/api/people/1/","name":"Umang Jain","email":"email@uajain.com"},"content":"Hi Hiro\n\nOn 12/9/20 4:21 PM, Kieran Bingham wrote:\n> Hi Hiro,\n>\n> On 09/12/2020 05:54, Hirokazu Honda wrote:\n>> Use the newly introduced Camera3StreamConfig to associate the\n>> Android requested streams with the associated StreamConfiguration\n>> in a vector of configurations.\n>>\n>> This change prepares to sort the vector of configuration before using\n>> it to configure the Camera and populate the streams_ vector.\n>>\n>> No functional changes intended.\n>>\n>> Signed-off-by: Hirokazu Honda \n>> Reviewed-by: Jacopo Mondi \n> Reviewed-by: Kieran Bingham \n\nReviewed-by: Umang Jain \n>\n>> ---\n>> src/android/camera_device.cpp | 52 +++++++++++++++++++++--------------\n>> 1 file changed, 31 insertions(+), 21 deletions(-)\n>>\n>> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n>> index 09269d95..b7bf3d88 100644\n>> --- a/src/android/camera_device.cpp\n>> +++ b/src/android/camera_device.cpp\n>> @@ -1240,6 +1240,9 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n>> \tstreams_.clear();\n>> \tstreams_.reserve(stream_list->num_streams);\n>>\n>> +\tstd::vector streamConfigs;\n>> +\tstreamConfigs.reserve(stream_list->num_streams);\n>> +\n>> \t/* First handle all non-MJPEG streams. */\n>> \tcamera3_stream_t *jpegStream = nullptr;\n>> \tfor (unsigned int i = 0; i < stream_list->num_streams; ++i) {\n>> @@ -1270,14 +1273,12 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n>> \t\t\tcontinue;\n>> \t\t}\n>>\n>> -\t\tStreamConfiguration streamConfiguration;\n>> -\t\tstreamConfiguration.size = size;\n>> -\t\tstreamConfiguration.pixelFormat = format;\n>> -\n>> -\t\tconfig_->addConfiguration(streamConfiguration);\n>> -\t\tstreams_.emplace_back(this, CameraStream::Type::Direct,\n>> -\t\t\t\t stream, config_->size() - 1);\n>> -\t\tstream->priv = static_cast(&streams_.back());\n>> +\t\tCamera3StreamConfig streamConfig;\n>> +\t\tstreamConfig.streams = { stream };\n>> +\t\tstreamConfig.types = { CameraStream::Type::Direct };\n>> +\t\tstreamConfig.config.size = size;\n>> +\t\tstreamConfig.config.pixelFormat = format;\n>> +\t\tstreamConfigs.push_back(std::move(streamConfig));\n>> \t}\n>>\n>> \t/* Now handle the MJPEG streams, adding a new stream if required. */\n>> @@ -1286,9 +1287,8 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n>> \t\tint index = -1;\n>>\n>> \t\t/* Search for a compatible stream in the non-JPEG ones. */\n>> -\t\tfor (unsigned int i = 0; i < config_->size(); i++) {\n>> -\t\t\tStreamConfiguration &cfg = config_->at(i);\n>> -\n>> +\t\tfor (size_t i = 0; i < streamConfigs.size(); ++i) {\n>> +\t\t\tconst auto &cfg = streamConfigs[i].config;\n>> \t\t\t/*\n>> \t\t\t * \\todo The PixelFormat must also be compatible with\n>> \t\t\t * the encoder.\n>> @@ -1310,28 +1310,38 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n>> \t\t * introduce a new stream to satisfy the request requirements.\n>> \t\t */\n>> \t\tif (index < 0) {\n>> -\t\t\tStreamConfiguration streamConfiguration;\n>> -\n>> \t\t\t/*\n>> \t\t\t * \\todo The pixelFormat should be a 'best-fit' choice\n>> \t\t\t * and may require a validation cycle. This is not yet\n>> \t\t\t * handled, and should be considered as part of any\n>> \t\t\t * stream configuration reworks.\n>> \t\t\t */\n>> -\t\t\tstreamConfiguration.size.width = jpegStream->width;\n>> -\t\t\tstreamConfiguration.size.height = jpegStream->height;\n>> -\t\t\tstreamConfiguration.pixelFormat = formats::NV12;\n>> +\t\t\tCamera3StreamConfig streamConfig;\n>> +\t\t\tstreamConfig.config.size.width = jpegStream->width;\n>> +\t\t\tstreamConfig.config.size.height = jpegStream->height;\n>> +\t\t\tstreamConfig.config.pixelFormat = formats::NV12;\n>> +\t\t\tstreamConfigs.push_back(std::move(streamConfig));\n>>\n>> -\t\t\tLOG(HAL, Info) << \"Adding \" << streamConfiguration.toString()\n>> +\t\t\tLOG(HAL, Info) << \"Adding \" << streamConfig.config.toString()\n>> \t\t\t\t << \" for MJPEG support\";\n>>\n>> \t\t\ttype = CameraStream::Type::Internal;\n>> -\t\t\tconfig_->addConfiguration(streamConfiguration);\n>> -\t\t\tindex = config_->size() - 1;\n>> +\t\t\tindex = streamConfigs.size() - 1;\n>> \t\t}\n>>\n>> -\t\tstreams_.emplace_back(this, type, jpegStream, index);\n>> -\t\tjpegStream->priv = static_cast(&streams_.back());\n>> +\t\tstreamConfigs[index].streams.push_back(jpegStream);\n>> +\t\tstreamConfigs[index].types.push_back(type);\n>> +\t}\n>> +\n>> +\tfor (const auto &streamConfig : streamConfigs) {\n>> +\t\tconfig_->addConfiguration(streamConfig.config);\n>> +\t\tfor (size_t i = 0; i < streamConfig.streams.size(); ++i) {\n>> +\t\t\tcamera3_stream_t *stream = streamConfig.streams[i];\n>> +\t\t\tconst CameraStream::Type type = streamConfig.types[i];\n>> +\t\t\tstreams_.emplace_back(this, type,\n>> +\t\t\t\t\t stream, config_->size() - 1);\n>> +\t\t\tstream->priv = static_cast(&streams_.back());\n>> +\t\t}\n>> \t}\n>>\n>> \tswitch (config_->validate()) {\n>> --\n>> 2.29.2.576.ga3fc446d84-goog\n>> _______________________________________________\n>> libcamera-devel mailing list\n>> libcamera-devel@lists.libcamera.org\n>> https://lists.libcamera.org/listinfo/libcamera-devel\n>>","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 5C5FEBD80A\n\tfor ;\n\tWed, 9 Dec 2020 12:45:15 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 2929767E72;\n\tWed, 9 Dec 2020 13:45:15 +0100 (CET)","from mail.uajain.com (static.126.159.217.95.clients.your-server.de\n\t[95.217.159.126])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id BEC8D635D3\n\tfor ;\n\tWed, 9 Dec 2020 13:45:13 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=uajain.com header.i=@uajain.com\n\theader.b=\"qz9Qhx28\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=uajain.com; s=mail;\n\tt=1607517913; bh=mksmVsQnrHRGw4PJTM3bsPefSpiuXc9ZdYk/cNHsbA8=;\n\th=Subject:To:References:From:In-Reply-To;\n\tb=qz9Qhx28FnH9AaPuHbI8mHoVe4jXs919ut2o9ihhzhl1BbjMA/9/dYNcoQpcOLQS/\n\t2XxIkQrnENwuOYwdv2G1zWRUL4HEHS8dnY8Wq31PjS/P0kBYbw3PIA7RG/Vq7rxovu\n\tneL0+ArppSZ38I1K+5ISdn8S7DBLGQglZgJ2gEBj2aV2ouGoWi+t8gD1N+zI7TSB1j\n\t7tk27xr2WOkBF+ds9zmjGTCAlUdZqQi9t5ZHrS83Asu30KLuAHFbvljoUj/+dg7InX\n\tXcHaA0h1tzHLCic5WTx0KEM3TODRmWPyQLnhKt2ph2hK4pMeKoe2frmk8RGWXIaHNy\n\tn8wfWuvc9uEYg==","To":"kieran.bingham@ideasonboard.com, Hirokazu Honda ,\n\tlibcamera-devel@lists.libcamera.org","References":"<20201209055410.3232987-1-hiroh@chromium.org>\n\t<20201209055410.3232987-2-hiroh@chromium.org>\n\t","From":"Umang Jain ","Message-ID":"<9ba2f658-5cb5-343e-fdd4-1928100d71c1@uajain.com>","Date":"Wed, 9 Dec 2020 18:15:10 +0530","Mime-Version":"1.0","In-Reply-To":"","Content-Language":"en-US","Subject":"Re: [libcamera-devel] [PATCH v5 2/3] android: camera_device: Use\n\tCamera3StreamConfig in configureStreams()","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-Transfer-Encoding":"7bit","Content-Type":"text/plain; charset=\"us-ascii\"; Format=\"flowed\"","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":14210,"web_url":"https://patchwork.libcamera.org/comment/14210/","msgid":"","date":"2020-12-10T21:42:55","subject":"Re: [libcamera-devel] [PATCH v5 2/3] android: camera_device: Use\n\tCamera3StreamConfig in configureStreams()","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Hiro,\n\nThank you for the patch.\n\nOn Wed, Dec 09, 2020 at 05:54:09AM +0000, Hirokazu Honda wrote:\n> Use the newly introduced Camera3StreamConfig to associate the\n> Android requested streams with the associated StreamConfiguration\n> in a vector of configurations.\n> \n> This change prepares to sort the vector of configuration before using\n> it to configure the Camera and populate the streams_ vector.\n> \n> No functional changes intended.\n> \n> Signed-off-by: Hirokazu Honda \n> Reviewed-by: Jacopo Mondi \n> ---\n> src/android/camera_device.cpp | 52 +++++++++++++++++++++--------------\n> 1 file changed, 31 insertions(+), 21 deletions(-)\n> \n> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> index 09269d95..b7bf3d88 100644\n> --- a/src/android/camera_device.cpp\n> +++ b/src/android/camera_device.cpp\n> @@ -1240,6 +1240,9 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n> \tstreams_.clear();\n> \tstreams_.reserve(stream_list->num_streams);\n> \n> +\tstd::vector streamConfigs;\n> +\tstreamConfigs.reserve(stream_list->num_streams);\n> +\n> \t/* First handle all non-MJPEG streams. */\n> \tcamera3_stream_t *jpegStream = nullptr;\n> \tfor (unsigned int i = 0; i < stream_list->num_streams; ++i) {\n> @@ -1270,14 +1273,12 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n> \t\t\tcontinue;\n> \t\t}\n> \n> -\t\tStreamConfiguration streamConfiguration;\n> -\t\tstreamConfiguration.size = size;\n> -\t\tstreamConfiguration.pixelFormat = format;\n> -\n> -\t\tconfig_->addConfiguration(streamConfiguration);\n> -\t\tstreams_.emplace_back(this, CameraStream::Type::Direct,\n> -\t\t\t\t stream, config_->size() - 1);\n> -\t\tstream->priv = static_cast(&streams_.back());\n> +\t\tCamera3StreamConfig streamConfig;\n> +\t\tstreamConfig.streams = { stream };\n> +\t\tstreamConfig.types = { CameraStream::Type::Direct };\n> +\t\tstreamConfig.config.size = size;\n> +\t\tstreamConfig.config.pixelFormat = format;\n> +\t\tstreamConfigs.push_back(std::move(streamConfig));\n> \t}\n> \n> \t/* Now handle the MJPEG streams, adding a new stream if required. */\n> @@ -1286,9 +1287,8 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n> \t\tint index = -1;\n> \n> \t\t/* Search for a compatible stream in the non-JPEG ones. */\n> -\t\tfor (unsigned int i = 0; i < config_->size(); i++) {\n> -\t\t\tStreamConfiguration &cfg = config_->at(i);\n> -\n> +\t\tfor (size_t i = 0; i < streamConfigs.size(); ++i) {\n> +\t\t\tconst auto &cfg = streamConfigs[i].config;\n\nWe can keep the blank line here.\n\n> \t\t\t/*\n> \t\t\t * \\todo The PixelFormat must also be compatible with\n> \t\t\t * the encoder.\n> @@ -1310,28 +1310,38 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n> \t\t * introduce a new stream to satisfy the request requirements.\n> \t\t */\n> \t\tif (index < 0) {\n> -\t\t\tStreamConfiguration streamConfiguration;\n> -\n> \t\t\t/*\n> \t\t\t * \\todo The pixelFormat should be a 'best-fit' choice\n> \t\t\t * and may require a validation cycle. This is not yet\n> \t\t\t * handled, and should be considered as part of any\n> \t\t\t * stream configuration reworks.\n> \t\t\t */\n> -\t\t\tstreamConfiguration.size.width = jpegStream->width;\n> -\t\t\tstreamConfiguration.size.height = jpegStream->height;\n> -\t\t\tstreamConfiguration.pixelFormat = formats::NV12;\n> +\t\t\tCamera3StreamConfig streamConfig;\n> +\t\t\tstreamConfig.config.size.width = jpegStream->width;\n> +\t\t\tstreamConfig.config.size.height = jpegStream->height;\n> +\t\t\tstreamConfig.config.pixelFormat = formats::NV12;\n> +\t\t\tstreamConfigs.push_back(std::move(streamConfig));\n> \n> -\t\t\tLOG(HAL, Info) << \"Adding \" << streamConfiguration.toString()\n> +\t\t\tLOG(HAL, Info) << \"Adding \" << streamConfig.config.toString()\n> \t\t\t\t << \" for MJPEG support\";\n> \n> \t\t\ttype = CameraStream::Type::Internal;\n> -\t\t\tconfig_->addConfiguration(streamConfiguration);\n> -\t\t\tindex = config_->size() - 1;\n> +\t\t\tindex = streamConfigs.size() - 1;\n> \t\t}\n> \n> -\t\tstreams_.emplace_back(this, type, jpegStream, index);\n> -\t\tjpegStream->priv = static_cast(&streams_.back());\n> +\t\tstreamConfigs[index].streams.push_back(jpegStream);\n> +\t\tstreamConfigs[index].types.push_back(type);\n> +\t}\n> +\n> +\tfor (const auto &streamConfig : streamConfigs) {\n> +\t\tconfig_->addConfiguration(streamConfig.config);\n\nA blank line would be nice here too.\n\nThese two small issues can be addressed when applying.\n\n> +\t\tfor (size_t i = 0; i < streamConfig.streams.size(); ++i) {\n> +\t\t\tcamera3_stream_t *stream = streamConfig.streams[i];\n> +\t\t\tconst CameraStream::Type type = streamConfig.types[i];\n\nThis will become simpler with the rework of the Camera3StreamConfig\nstructure as proposed in patch 1/3.\n\nReviewed-by: Laurent Pinchart \n\n> +\t\t\tstreams_.emplace_back(this, type,\n> +\t\t\t\t\t stream, config_->size() - 1);\n> +\t\t\tstream->priv = static_cast(&streams_.back());\n> +\t\t}\n> \t}\n> \n> \tswitch (config_->validate()) {","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 14352BD80A\n\tfor ;\n\tThu, 10 Dec 2020 21:43:04 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 8715360887;\n\tThu, 10 Dec 2020 22:43:03 +0100 (CET)","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 BC70B60323\n\tfor ;\n\tThu, 10 Dec 2020 22:43:01 +0100 (CET)","from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 2E6AE25E;\n\tThu, 10 Dec 2020 22:43:01 +0100 (CET)"],"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=\"sjCMdOlF\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1607636581;\n\tbh=twSqUjTWR/MEjXsDk3var3TvKASxq5XsviZZ/HJTGHA=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=sjCMdOlFOiSqYLxv5RbafGfk8zaLlJVtmRd/mP3dnVAk+F1+icUal2O6PFu66Y/YV\n\tGfZEn09FxHlvWS3hQ6hBjc2h+USD9ggzQo3UX7q2NgQji3MJ1CsfzQW9CQM9W8TKCE\n\tdF9T5NRey93NRct6nKgkzWmxagi6dE6dXJaq/0Q4=","Date":"Thu, 10 Dec 2020 23:42:55 +0200","From":"Laurent Pinchart ","To":"Hirokazu Honda ","Message-ID":"","References":"<20201209055410.3232987-1-hiroh@chromium.org>\n\t<20201209055410.3232987-2-hiroh@chromium.org>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20201209055410.3232987-2-hiroh@chromium.org>","Subject":"Re: [libcamera-devel] [PATCH v5 2/3] android: camera_device: Use\n\tCamera3StreamConfig in configureStreams()","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":"libcamera-devel@lists.libcamera.org","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]