Patch Detail
Show a patch.
GET /api/patches/10524/?format=api
{ "id": 10524, "url": "https://patchwork.libcamera.org/api/patches/10524/?format=api", "web_url": "https://patchwork.libcamera.org/patch/10524/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20201201042514.3209146-1-hiroh@chromium.org>", "date": "2020-12-01T04:25:14", "name": "[libcamera-devel,RFC,v2] android: camera_device: Reorder configurations before request", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "6b927239322cbb34884463e1dd2ea1a91dafdc3e", "submitter": { "id": 63, "url": "https://patchwork.libcamera.org/api/people/63/?format=api", "name": "Hirokazu Honda", "email": "hiroh@chromium.org" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/10524/mbox/", "series": [ { "id": 1492, "url": "https://patchwork.libcamera.org/api/series/1492/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=1492", "date": "2020-12-01T04:25:14", "name": "[libcamera-devel,RFC,v2] android: camera_device: Reorder configurations before request", "version": 2, "mbox": "https://patchwork.libcamera.org/series/1492/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/10524/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/10524/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "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 A7273BE177\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 1 Dec 2020 04:25:27 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 30B18634A1;\n\tTue, 1 Dec 2020 05:25:27 +0100 (CET)", "from mail-pj1-x1041.google.com (mail-pj1-x1041.google.com\n\t[IPv6:2607:f8b0:4864:20::1041])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 4637560329\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 1 Dec 2020 05:25:25 +0100 (CET)", "by mail-pj1-x1041.google.com with SMTP id j13so443853pjz.3\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 30 Nov 2020 20:25:25 -0800 (PST)", "from hiroh.tok.corp.google.com\n\t([2401:fa00:8f:2:de4a:3eff:fe7d:f78f])\n\tby smtp.gmail.com with ESMTPSA id\n\tl17sm545619pjy.29.2020.11.30.20.25.21\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tMon, 30 Nov 2020 20:25:22 -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=\"fmxZ0Cgt\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org;\n\ts=google; h=from:to:cc:subject:date:message-id:mime-version\n\t:content-transfer-encoding;\n\tbh=S1e27upzQ1DCbTB8Ea+Ojf/hEaghpTdu0Po7DCAbPTw=;\n\tb=fmxZ0Cgtzwf5SHDpyLwL3Ze5zeH8+Zqpm/JWxN/p4lM/KyXIA0rKQ4szXP3MjNEXq8\n\tGjboz8iBAfSNIkcluPw2FnTqGxTNc2g1VL0G9ca6teNvb818i1NcvB/FB8JozSVF5HiL\n\t6ELokBwlx0ViiTKs1dNVGoxhLUmYPZfoxJ4o4=", "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:mime-version\n\t:content-transfer-encoding;\n\tbh=S1e27upzQ1DCbTB8Ea+Ojf/hEaghpTdu0Po7DCAbPTw=;\n\tb=OPptJ5ZWpHhISaaI3d17YKKGeIMlHql2OT4z1SzRCFm90QSv10Ya6OoWjsdJJbbCVD\n\tzZeNlf5VJMDggzpXyg8+zy2A3vGRrWO+BToYX1n54z+lrEL6H1ji2Q5Xvg8tOdc/pVtR\n\tpnKfDxzlopDsQHzSFCrPLByha5O+BuEcffz74PTk4wF8JLSGaB5woswD+YpII6fGKCaF\n\tqPrTU+ssAy5c1FrM8ytjd5dSqoc5WXpb6W/D4CqMgI17jC7dG0zRAdqoxMRDvtf7Z0wN\n\tnHb+vH91XFi4ml4vRlnXgb1lD1PI0TQoF0Ni+0YpE4l7GW1k1ZY+b75pVc4CJ8CkCWtL\n\t2Zvg==", "X-Gm-Message-State": "AOAM5337EpIA6F6HlO32Bwjf4M2H7i0YFs2PgLpjqPVNHSD1i6N+G21M\n\t9lQOHzCA7I3GDEvvG0SPixn0DOqLIcI3Sw==", "X-Google-Smtp-Source": "ABdhPJyBMAtncniBRqpB0DeFJ5mtpul6kugbzf0q1VZqujkO0Z8yOcwJHS2PwhgmTP4KGqDcwg7XaQ==", "X-Received": "by 2002:a17:902:9a4c:b029:d6:1f21:8021 with SMTP id\n\tx12-20020a1709029a4cb02900d61f218021mr1102429plv.58.1606796723168; \n\tMon, 30 Nov 2020 20:25:23 -0800 (PST)", "From": "Hirokazu Honda <hiroh@chromium.org>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Tue, 1 Dec 2020 13:25:14 +0900", "Message-Id": "<20201201042514.3209146-1-hiroh@chromium.org>", "X-Mailer": "git-send-email 2.29.2.454.gaff20da3a2-goog", "MIME-Version": "1.0", "Subject": "[libcamera-devel] [RFC PATCH v2] android: camera_device: Reorder\n\tconfigurations before request", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "This reorders configurations before calling\nCameraConfiguration::validate() so that the streams requested\nby an android HAL client can be achieved more likely.\n\nSigned-off-by: Hirokazu Honda <hiroh@chromium.org>\n---\n src/android/camera_device.cpp | 158 +++++++++++++++++++++++++++++-----\n 1 file changed, 137 insertions(+), 21 deletions(-)\n\n--\n2.29.2.454.gaff20da3a2-goog", "diff": "diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 4690346e..3de5a9f1 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -9,9 +9,11 @@\n #include \"camera_ops.h\"\n #include \"post_processor.h\"\n\n+#include <string.h>\n #include <sys/mman.h>\n #include <tuple>\n #include <vector>\n+#include <optional>\n\n #include <libcamera/control_ids.h>\n #include <libcamera/controls.h>\n@@ -128,6 +130,107 @@ const std::map<int, const Camera3Format> camera3FormatsMap = {\n \t},\n };\n\n+struct Camera3StreamsToConfig {\n+\tstd::vector<camera3_stream_t*> streams; // Destination(s).\n+\tstd::vector<CameraStream::Type> types; // CameraStream::Type(s).\n+\tStreamConfiguration config; // StreamConfiguration requested to a native camera.\n+};\n+\n+/*\n+ * Reorder the configurations so that CameraDevice can accept them as much as\n+ * possible.\n+ */\n+std::vector<Camera3StreamsToConfig> createdSortedCamera3StreamsToConfigs(\n+\tstd::vector<Camera3StreamsToConfig> unsortedStreamsToConfigs,\n+\tconst camera3_stream_t *jpegStream) {\n+\tconst size_t unsortedStreamsToConfigsSize = unsortedStreamsToConfigs.size();\n+\tstd::optional<Camera3StreamsToConfig> streamsToConfigForJpeg = std::nullopt;\n+\tif (jpegStream) {\n+\t\tfor (auto it = unsortedStreamsToConfigs.begin();\n+\t\t it != unsortedStreamsToConfigs.end(); it++) {\n+\t\t\tconst auto& streams = it->streams;\n+\t\t\tif (std::find(streams.begin(), streams.end(),\n+\t\t\t\t jpegStream) != streams.end()) {\n+\t\t\t\tstreamsToConfigForJpeg = *it;\n+\t\t\t\tunsortedStreamsToConfigs.erase(it);\n+\t\t\t\tbreak;\n+\t\t\t}\n+\t\t}\n+\t\tassert(streamsToConfigForJpeg.has_value());\n+\t}\n+\n+\tstd::map<uint32_t, std::vector<Camera3StreamsToConfig>> formatToStreamsToConfigs;\n+\tfor (const auto &streamsToConfig : unsortedStreamsToConfigs) {\n+\t\tconst StreamConfiguration &config = streamsToConfig.config;\n+\t\tformatToStreamsToConfigs[config.pixelFormat].push_back(streamsToConfig);\n+\n+\t}\n+\tfor (auto& [format, streamsToConfigs] : formatToStreamsToConfigs) {\n+\t\t/* Sorted by resolution. Smaller is put first. */\n+\t\tstd::sort(streamsToConfigs.begin(), streamsToConfigs.end(),\n+\t\t\t [](const auto &streamsToConfigA, const auto &streamsToConfigB) {\n+\t\t\t\t const Size &sizeA = streamsToConfigA.config.size;\n+\t\t\t\t const Size &sizeB = streamsToConfigA.config.size;\n+\t\t\t\t if (sizeA.width != sizeB.width)\n+\t\t\t\t\t return sizeA.width < sizeB.width;\n+\t\t\t\t return sizeA.height < sizeB.height;\n+\t\t\t });\n+\t}\n+\n+\tstd::vector<Camera3StreamsToConfig> sortedStreamsToConfigs;\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+\tif (formatToStreamsToConfigs.find(formats::NV12) != formatToStreamsToConfigs.end()) {\n+\t\tauto& nv12StreamsToConfigs = formatToStreamsToConfigs[formats::NV12];\n+\t\tconst Size& nv12LargestSize = nv12StreamsToConfigs.back().config.size;\n+\t\tif (streamsToConfigForJpeg &&\n+\t\t streamsToConfigForJpeg->config.pixelFormat == formats::NV12) {\n+\t\t\tconst Size& nv12SizeForJpeg = streamsToConfigForJpeg->config.size;\n+\t\t\t/*\n+\t\t\t * If JPEG will be created from NV12 and the size is\n+\t\t\t * larger than the largest NV12 remained configurations,\n+\t\t\t * then put the NV12 configuration for JPEG first.\n+\t\t\t */\n+\t\t\tif (nv12LargestSize.width < nv12SizeForJpeg.width &&\n+\t\t\t nv12LargestSize.height < nv12SizeForJpeg.height) {\n+\t\t\t\tsortedStreamsToConfigs.push_back(*streamsToConfigForJpeg);\n+\t\t\t\tstreamsToConfigForJpeg = std::nullopt;\n+\t\t\t}\n+\t\t}\n+\t\tsortedStreamsToConfigs.push_back(nv12StreamsToConfigs.back());\n+\t\tnv12StreamsToConfigs.pop_back();\n+\t}\n+\n+\t/*\n+\t * If the configuration for JPEG is there, then put it.\n+\t */\n+\tif (streamsToConfigForJpeg) {\n+\t\tsortedStreamsToConfigs.push_back(*streamsToConfigForJpeg);\n+\t\tstreamsToConfigForJpeg = std::nullopt;\n+\t}\n+\n+\t/*\n+\t * Put configurations with different formats and larger resolutions\n+\t * earlier.\n+\t */\n+\twhile (!formatToStreamsToConfigs.empty()) {\n+\t\tfor (auto it = formatToStreamsToConfigs.begin();\n+\t\t it != formatToStreamsToConfigs.end();) {\n+\t\t\tauto& streamsToConfigs = it->second;\n+\t\t\tif (streamsToConfigs.empty()) {\n+\t\t\t\tit = formatToStreamsToConfigs.erase(it);\n+\t\t\t\tcontinue;\n+\t\t\t}\n+\t\t\tsortedStreamsToConfigs.push_back(streamsToConfigs.back());\n+\t\t\tstreamsToConfigs.pop_back();\n+\t\t}\n+\t}\n+\tassert(sortedStreamsToConfigs.size() == unsortedStreamsToConfigsSize);\n+\treturn sortedStreamsToConfigs;\n+}\n+\n } /* namespace */\n\n LOG_DECLARE_CATEGORY(HAL)\n@@ -1225,6 +1328,9 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list)\n \tstreams_.clear();\n \tstreams_.reserve(stream_list->num_streams);\n\n+\tstd::vector<Camera3StreamsToConfig> streamsToConfigs;\n+\tstreamsToConfigs.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@@ -1255,14 +1361,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<void *>(&streams_.back());\n+\t\tCamera3StreamsToConfig streamsToConfig;\n+\t\tstreamsToConfig.streams = {stream};\n+\t\tstreamsToConfig.types = {CameraStream::Type::Direct};\n+\t\tstreamsToConfig.config.size = size;\n+\t\tstreamsToConfig.config.pixelFormat = format;\n+\t\tstreamsToConfigs.push_back(std::move(streamsToConfig));\n \t}\n\n \t/* Now handle the MJPEG streams, adding a new stream if required. */\n@@ -1271,9 +1375,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 < streamsToConfigs.size(); ++i) {\n+\t\t\tconst auto& cfg = streamsToConfigs[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@@ -1295,28 +1398,41 @@ 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\tCamera3StreamsToConfig streamsToConfig;\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\tstreamsToConfig.config.size.width = jpegStream->width;\n+\t\t\tstreamsToConfig.config.size.height = jpegStream->height;\n+\t\t\tstreamsToConfig.config.pixelFormat = formats::NV12;\n+\t\t\tstreamsToConfigs.push_back(std::move(streamsToConfig));\n\n-\t\t\tLOG(HAL, Info) << \"Adding \" << streamConfiguration.toString()\n+\t\t\tLOG(HAL, Info) << \"Adding \" << streamsToConfig.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 = streamsToConfigs.size() - 1;\n \t\t}\n\n-\t\tstreams_.emplace_back(this, type, jpegStream, index);\n-\t\tjpegStream->priv = static_cast<void *>(&streams_.back());\n+\t\tstreamsToConfigs[index].streams.push_back(jpegStream);\n+\t\tstreamsToConfigs[index].types.push_back(type);\n+\t}\n+\n+\tstreamsToConfigs =\n+\t\tcreatedSortedCamera3StreamsToConfigs(std::move(streamsToConfigs),\n+\t\t\t\t\t\t jpegStream);\n+\tfor (auto& streamsToConfig : streamsToConfigs) {\n+\t\tconfig_->addConfiguration(streamsToConfig.config);\n+\t\tfor (size_t i = 0; i < streamsToConfig.streams.size(); ++i) {\n+\t\t\tauto* stream = streamsToConfig.streams[i];\n+\t\t\tconst CameraStream::Type type = streamsToConfig.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<void*>(&streams_.back());\n+\t\t}\n \t}\n\n \tswitch (config_->validate()) {\n", "prefixes": [ "libcamera-devel", "RFC", "v2" ] }