{"id":10651,"url":"https://patchwork.libcamera.org/api/1.1/patches/10651/?format=json","web_url":"https://patchwork.libcamera.org/patch/10651/","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":"<20201212004149.158801-3-hiroh@chromium.org>","date":"2020-12-12T00:41:49","name":"[libcamera-devel,v8,3/3] android: camera_device: Reorder configurations before requesting","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"b10bd2e1063548c7524416ad1b6a95c92f3f8ee2","submitter":{"id":63,"url":"https://patchwork.libcamera.org/api/1.1/people/63/?format=json","name":"Hirokazu Honda","email":"hiroh@chromium.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/10651/mbox/","series":[{"id":1528,"url":"https://patchwork.libcamera.org/api/1.1/series/1528/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1528","date":"2020-12-12T00:41:49","name":"[libcamera-devel,v8,1/3] android: camera_device: Introduce Camera3StreamConfig","version":8,"mbox":"https://patchwork.libcamera.org/series/1528/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/10651/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/10651/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 C619CBD80A\n\tfor ;\n\tSat, 12 Dec 2020 01:12:40 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 41B0F746F0;\n\tSat, 12 Dec 2020 02:12:40 +0100 (CET)","from mail-vs1-xe2c.google.com (mail-vs1-xe2c.google.com\n\t[IPv6:2607:f8b0:4864:20::e2c])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id BAAE468053\n\tfor ;\n\tSat, 12 Dec 2020 02:12:36 +0100 (CET)","by mail-vs1-xe2c.google.com with SMTP id w18so5801252vsk.12\n\tfor ;\n\tFri, 11 Dec 2020 17:12:36 -0800 (PST)","from hiroh.c.googlers.com.com\n\t(128.141.236.35.bc.googleusercontent.com. [35.236.141.128])\n\tby smtp.gmail.com with ESMTPSA id\n\tx188sm11558534pfd.43.2020.12.11.16.41.57\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tFri, 11 Dec 2020 16:41:58 -0800 (PST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=chromium.org header.i=@chromium.org\n\theader.b=\"fW7p1zEo\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org;\n\ts=google; \n\th=from:to:cc:subject:date:message-id:in-reply-to:references\n\t:mime-version:content-transfer-encoding;\n\tbh=mrhlPWp8sVUtRnP/iC6DtmwkaemYBaUVHJT6rsBtREE=;\n\tb=fW7p1zEobdCx8rRDZ+pdnKnEEC1Tbj8RnrUBFmvUuSBo04jY9K61AucMVeKbqlLpsC\n\tETBDCL9VEpcDkVuoOPQ7BQ3n4LovpahVZgkxI8w/eDZhu05ZjOBYkFjPMWHldf+6aUE5\n\tJs8LystEXR4nN9MHQ7eiGu5YmROa3rvJMXSfY=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references:mime-version:content-transfer-encoding;\n\tbh=mrhlPWp8sVUtRnP/iC6DtmwkaemYBaUVHJT6rsBtREE=;\n\tb=jY0xHqz1Z2G3FSsACgXDwT40+yZBaMxEkuiiUTcEcmAGB/7DJmhO1W4UFU2/Z4XHtg\n\tdtXfMQdENhAbKNo63cyuImDbHqm8RB94eQ5xBc91BUY7oVX6fUQOPwAZXfAc34qM8611\n\tBu3/nXlw+kqIG9/1ZaN7DSIdyH9aNijj0in88j3eyt21V5RRjd5HDNkHGii+PTQw7hJP\n\t7I0tmG1UfQz7gzTwikk7CsnRoIFMPF1IyZLRsFzDFoKNL7fiebsO6rgg5QFFXQh5lAoo\n\t7V+cqmfOkFofKEBJMer1WMYnFkQ+AGMOw7+96ye+XN7r6FyCobAncu3BvzT/epBcoa+2\n\tDALA==","X-Gm-Message-State":"AOAM531GSbiLCvmhpwqTd1D/DtwGS78mOJsRgHKRWvH+mSfvD1cDO1/3\n\t78eZbk859iQR6+gQ0CFZGG230dVonz0tN+Tz","X-Google-Smtp-Source":"ABdhPJxk5GIvcZomG002r6aNwl/NnkL4VwFzt5OjnscswBzNnFQBKAAX3w7Ad4Up7Ah5gf+idD4B5A==","X-Received":"by 2002:a62:e213:0:b029:19e:59d3:a76a with SMTP id\n\ta19-20020a62e2130000b029019e59d3a76amr5526097pfi.53.1607733718943; \n\tFri, 11 Dec 2020 16:41:58 -0800 (PST)","From":"Hirokazu Honda ","To":"libcamera-devel@lists.libcamera.org","Date":"Sat, 12 Dec 2020 00:41:49 +0000","Message-Id":"<20201212004149.158801-3-hiroh@chromium.org>","X-Mailer":"git-send-email 2.29.2.576.ga3fc446d84-goog","In-Reply-To":"<20201212004149.158801-1-hiroh@chromium.org>","References":"<20201212004149.158801-1-hiroh@chromium.org>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v8 3/3] android: camera_device: Reorder\n\tconfigurations 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","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"This reorders Camera3Configs before executing\nCameraConfiguration::validate() to make it easier for the Camera\nto satisfy the Android framework request.\n\nSigned-off-by: Hirokazu Honda \nReviewed-by: Jacopo Mondi \nReviewed-by: Kieran Bingham \nReviewed-by: Umang Jain \nReviewed-by: Laurent Pinchart \n---\n src/android/camera_device.cpp | 113 +++++++++++++++++++++++++++++++++-\n 1 file changed, 111 insertions(+), 2 deletions(-)\n\n--\n2.29.2.576.ga3fc446d84-goog","diff":"diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 7e8b2818..0b68a927 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -27,6 +27,8 @@\n\n using namespace libcamera;\n\n+LOG_DECLARE_CATEGORY(HAL)\n+\n namespace {\n\n /*\n@@ -144,9 +146,115 @@ struct Camera3StreamConfig {\n \tstd::vector streams;\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+void sortCamera3StreamConfigs(std::vector &unsortedConfigs,\n+\t\t\t const camera3_stream_t *jpegStream)\n+{\n+\tconst Camera3StreamConfig *jpegConfig = nullptr;\n+\n+\tstd::map> formatToConfigs;\n+\tfor (const auto &streamConfig : unsortedConfigs) {\n+\t\tif (jpegStream && !jpegConfig) {\n+\t\t\tconst auto &streams = streamConfig.streams;\n+\t\t\tif (std::find_if(streams.begin(), streams.end(),\n+\t\t\t\t\t [jpegStream](const auto &stream) {\n+\t\t\t\t\t\t return stream.stream == jpegStream;\n+\t\t\t\t\t }) != streams.end()) {\n+\t\t\t\tjpegConfig = &streamConfig;\n+\t\t\t\tcontinue;\n+\t\t\t}\n+\t\t}\n+\t\tformatToConfigs[streamConfig.config.pixelFormat].push_back(&streamConfig);\n+\t}\n+\tif (jpegStream && !jpegConfig)\n+\t\tLOG(HAL, Fatal) << \"No Camera3StreamConfig is found for JPEG\";\n+\n+\tfor (auto &fmt : formatToConfigs) {\n+\t\tauto &streamConfigs = fmt.second;\n+\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\t const Size &sizeA = streamConfigA->config.size;\n+\t\t\t\t const Size &sizeB = streamConfigB->config.size;\n+\t\t\t\t return sizeA < sizeB;\n+\t\t\t });\n+\t}\n+\n+\tstd::vector sortedConfigs;\n+\tsortedConfigs.reserve(unsortedConfigs.size());\n+\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 Camera3StreamConfig *nv12Largest = nv12Configs.back();\n+\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+\t\t\tconst Size &nv12LargestSize = nv12Largest->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 = nullptr;\n+\t\t\t}\n+\t\t}\n+\n+\t\tLOG(HAL, Debug) << \"Insert \" << nv12Largest->config.toString();\n+\t\tsortedConfigs.push_back(*nv12Largest);\n+\t\tnv12Configs.pop_back();\n+\n+\t\tif (nv12Configs.empty())\n+\t\t\tformatToConfigs.erase(nv12It);\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 = nullptr;\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\tLOG(HAL, Debug) << \"Insert \" << configs.back()->config.toString();\n+\t\t\tsortedConfigs.push_back(*configs.back());\n+\t\t\tconfigs.pop_back();\n+\n+\t\t\tif (configs.empty())\n+\t\t\t\tit = formatToConfigs.erase(it);\n+\t\t\telse\n+\t\t\t\tit++;\n+\t\t}\n+\t}\n+\n+\tASSERT(sortedConfigs.size() == unsortedConfigs.size());\n+\n+\tunsortedConfigs = sortedConfigs;\n+}\n+\n+} /* namespace */\n\n MappedCamera3Buffer::MappedCamera3Buffer(const buffer_handle_t camera3buffer,\n \t\t\t\t\t int flags)\n@@ -1356,6 +1464,7 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n \t\tstreamConfigs[index].streams.push_back({ jpegStream, type });\n \t}\n\n+\tsortCamera3StreamConfigs(streamConfigs, jpegStream);\n \tfor (const auto &streamConfig : streamConfigs) {\n \t\tconfig_->addConfiguration(streamConfig.config);\n\n","prefixes":["libcamera-devel","v8","3/3"]}