[{"id":14154,"web_url":"https://patchwork.libcamera.org/comment/14154/","msgid":"<20201208184226.v47jyv6e3n5axgpm@uno.localdomain>","date":"2020-12-08T18:42:26","subject":"Re: [libcamera-devel] [PATCH v4 3/3] android: camera_device:\n\tReorder configurations before requesting","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"content":"Hi Hiro,\n\nOn Tue, Dec 08, 2020 at 03:42:33AM +0000, Hirokazu Honda wrote:\n> This reorders Camera3Configs before executing\n> CameraConfiguration::validate() to make it easier for the Camera\n> to satisfy the Android framework request.\n>\n> Signed-off-by: Hirokazu Honda \n\nThanks for addressing comments received on the previous version.\n\nReviewed-by: Jacopo Mondi \n\nThanks\n j\n\n> ---\n> src/android/camera_device.cpp | 108 +++++++++++++++++++++++++++++++++-\n> 1 file changed, 106 insertions(+), 2 deletions(-)\n>\n> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> index b7bf3d88..36d0b343 100644\n> --- a/src/android/camera_device.cpp\n> +++ b/src/android/camera_device.cpp\n> @@ -9,6 +9,7 @@\n> #include \"camera_ops.h\"\n> #include \"post_processor.h\"\n>\n> +#include \n> #include \n> #include \n> #include \n> @@ -27,6 +28,8 @@\n>\n> using namespace libcamera;\n>\n> +LOG_DECLARE_CATEGORY(HAL)\n> +\n> namespace {\n>\n> /*\n> @@ -140,9 +143,108 @@ struct Camera3StreamConfig {\n> \tstd::vector types;\n> \tStreamConfiguration config;\n> };\n> -} /* namespace */\n>\n> -LOG_DECLARE_CATEGORY(HAL)\n> +/*\n> + * Reorder the configurations so that libcamera::Camera can accept them as much\n> + * as possible. The sort rule is as follows.\n> + * 1.) The configuration for NV12 request whose resolution is the largest.\n> + * 2.) The configuration for JPEG request.\n> + * 3.) Others. Larger resolutions and different formats are put earlier.\n> + */\n> +std::vector sortCamera3StreamConfigs(\n> +\tstd::vector unsortedConfigs,\n> +\tconst camera3_stream_t *jpegStream) {\n> +\tconst size_t unsortedSize = unsortedConfigs.size();\n> +\tstd::optional jpegConfig = std::nullopt;\n> +\n> +\tif (jpegStream) {\n> +\t\tfor (size_t i = 0; i < unsortedSize; ++i) {\n> +\t\t\tconst auto &streams = unsortedConfigs[i].streams;\n> +\t\t\tif (std::find(streams.begin(), streams.end(),\n> +\t\t\t\t jpegStream) != streams.end()) {\n> +\t\t\t\tjpegConfig = std::move(unsortedConfigs[i]);\n> +\t\t\t\tunsortedConfigs.erase(unsortedConfigs.begin() + i);\n> +\t\t\t\tbreak;\n> +\t\t\t}\n> +\t\t}\n> +\t\tif (!jpegConfig)\n> +\t\t\tLOG(HAL, Fatal) << \"No Camera3StreamConfig is found for Jpeg\";\n> +\t}\n> +\n> +\tstd::map> formatToConfigs;\n> +\tfor (const auto &streamConfig : unsortedConfigs) {\n> +\t\tconst StreamConfiguration &config = streamConfig.config;\n> +\t\tformatToConfigs[config.pixelFormat].push_back(streamConfig);\n> +\n> +\t}\n> +\tfor (auto &[format, streamConfigs] : formatToConfigs) {\n> +\t\t/* Sorted by resolution. Smaller is put first. */\n> +\t\tstd::sort(streamConfigs.begin(), streamConfigs.end(),\n> +\t\t\t [](const auto &streamConfigA, const auto &streamConfigB) {\n> +\t\t\t\tconst Size &sizeA = streamConfigA.config.size;\n> +\t\t\t\tconst Size &sizeB = streamConfigB.config.size;\n> +\t\t\t\treturn sizeA < sizeB;\n> +\t\t\t });\n> +\t}\n> +\n> +\tstd::vector sortedConfigs;\n> +\tsortedConfigs.reserve(unsortedSize);\n> +\t/*\n> +\t * NV12 is the most prioritized format. Put the configuration with NV12\n> +\t * and the largest resolution first.\n> +\t */\n> +\tconst auto nv12It = formatToConfigs.find(formats::NV12);\n> +\tif (nv12It != formatToConfigs.end()) {\n> +\t\tauto &nv12Configs = nv12It->second;\n> +\t\tconst Size &nv12LargestSize = nv12Configs.back().config.size;\n> +\t\t/*\n> +\t\t * If JPEG will be created from NV12 and the size is larger than\n> +\t\t * the largest NV12 configurations, then put the NV12\n> +\t\t * configuration for JPEG first.\n> +\t\t */\n> +\t\tif (jpegConfig && jpegConfig->config.pixelFormat == formats::NV12) {\n> +\t\t\tconst Size &nv12SizeForJpeg = jpegConfig->config.size;\n> +\n> +\t\t\tif (nv12LargestSize < nv12SizeForJpeg) {\n> +\t\t\t\tLOG(HAL, Debug) << \"Insert \" << jpegConfig->config.toString();\n> +\t\t\t\tsortedConfigs.push_back(std::move(*jpegConfig));\n> +\t\t\t\tjpegConfig = std::nullopt;\n> +\t\t\t}\n> +\t\t}\n> +\t\tLOG(HAL, Debug) << \"Insert \" << nv12Configs.back().config.toString();\n> +\t\tsortedConfigs.push_back(std::move(nv12Configs.back()));\n> +\t\tnv12Configs.pop_back();\n> +\t}\n> +\n> +\t/* If the configuration for JPEG is there, then put it. */\n> +\tif (jpegConfig) {\n> +\t\tLOG(HAL, Debug) << \"Insert \" << jpegConfig->config.toString();\n> +\t\tsortedConfigs.push_back(std::move(*jpegConfig));\n> +\t\tjpegConfig = std::nullopt;\n> +\t}\n> +\n> +\t/*\n> +\t * Put configurations with different formats and larger resolutions\n> +\t * earlier.\n> +\t */\n> +\twhile (!formatToConfigs.empty()) {\n> +\t\tfor (auto it = formatToConfigs.begin(); it != formatToConfigs.end();) {\n> +\t\t\tauto& configs = it->second;\n> +\t\t\tif (configs.empty()) {\n> +\t\t\t\tit = formatToConfigs.erase(it);\n> +\t\t\t\tcontinue;\n> +\t\t\t}\n> +\t\t\tLOG(HAL, Debug) << \"Insert \" << configs.back().config.toString();\n> +\t\t\tsortedConfigs.push_back(std::move(configs.back()));\n> +\t\t\tconfigs.pop_back();\n> +\t\t\tit++;\n> +\t\t}\n> +\t}\n> +\tassert(sortedConfigs.size() == unsortedSize);\n> +\n> +\treturn sortedConfigs;\n> +}\n> +} /* namespace */\n>\n> MappedCamera3Buffer::MappedCamera3Buffer(const buffer_handle_t camera3buffer,\n> \t\t\t\t\t int flags)\n> @@ -1333,6 +1435,8 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n> \t\tstreamConfigs[index].types.push_back(type);\n> \t}\n>\n> +\tstreamConfigs = sortCamera3StreamConfigs(std::move(streamConfigs),\n> +\t\t\t\t\t\t jpegStream);\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> --\n> 2.29.2.576.ga3fc446d84-goog","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 A5E4CBDB20\n\tfor ;\n\tTue, 8 Dec 2020 18:42:20 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 485CC67F0A;\n\tTue, 8 Dec 2020 19:42:20 +0100 (CET)","from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net\n\t[217.70.183.197])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id A6D1A67F09\n\tfor ;\n\tTue, 8 Dec 2020 19:42:18 +0100 (CET)","from uno.localdomain (mob-37-118-42-44.net.vodafone.it\n\t[37.118.42.44]) (Authenticated sender: jacopo@jmondi.org)\n\tby relay5-d.mail.gandi.net (Postfix) with ESMTPSA id DB2651C0003;\n\tTue, 8 Dec 2020 18:42:17 +0000 (UTC)"],"X-Originating-IP":"37.118.42.44","Date":"Tue, 8 Dec 2020 19:42:26 +0100","From":"Jacopo Mondi ","To":"Hirokazu Honda ","Message-ID":"<20201208184226.v47jyv6e3n5axgpm@uno.localdomain>","References":"<20201208034234.2501401-1-hiroh@chromium.org>\n\t<20201208034234.2501401-3-hiroh@chromium.org>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20201208034234.2501401-3-hiroh@chromium.org>","Subject":"Re: [libcamera-devel] [PATCH v4 3/3] android: camera_device:\n\tReorder configurations before requesting","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\" "}}]