From patchwork Wed Dec 9 05:54:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hirokazu Honda X-Patchwork-Id: 10622 Return-Path: X-Original-To: parsemail@patchwork.libcamera.org Delivered-To: parsemail@patchwork.libcamera.org Received: from lancelot.ideasonboard.com (lancelot.ideasonboard.com [92.243.16.209]) by patchwork.libcamera.org (Postfix) with ESMTPS id 2AC47BDE19 for ; Wed, 9 Dec 2020 05:54:22 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id A2EE767F33; Wed, 9 Dec 2020 06:54:21 +0100 (CET) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="Xwq/SwKx"; dkim-atps=neutral Received: from mail-pj1-x1043.google.com (mail-pj1-x1043.google.com [IPv6:2607:f8b0:4864:20::1043]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 6906367F2F for ; Wed, 9 Dec 2020 06:54:20 +0100 (CET) Received: by mail-pj1-x1043.google.com with SMTP id z12so291579pjn.1 for ; Tue, 08 Dec 2020 21:54:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Ou0CpixUBht67VFwIfiQUkkAuYyABRXfhf8Z18Fbfr8=; b=Xwq/SwKxclPijT+ujet7KF5nKl5lMp3CMJ4oE9ZOg2IHc5PZWsZ4XhTIbUZRfWnqwO CDXUcCrDjpTj454EPBW7OAl3gF8mB7QzTClxAnrNkN+HVTo8ys5qmgbH+VICygwYSTjI Sp16Zt71m1DeQJRJnlmTylp7POQnzoQq9xXGs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Ou0CpixUBht67VFwIfiQUkkAuYyABRXfhf8Z18Fbfr8=; b=X95FgUeQlNaN9cGqt8plrOtT8x4rqeU00BgA0pLetOZEyvP+XfiJcg6VRU5iN2rbDO XUIlr/rEtl+J4mO/99gPfedp4EGCOliXjDKx4o7K9NPYp6JRnpbfIGNgglpA7F9uEhoQ ENPD3f+GTFgZvrifML8J97qgNASQNcXQthDjahJHuQxrE8qHB7UjIQbT8vCn/4i+WQs2 ZaBxnZRbAqKFGz9KZjLpVeHKOyG+8YQdIJsbbJ/oI0OD7GDNh9V24tNQa6QiE+7kkziq eDHyilbobTJtVwqxJX/Ng0o7nblb+1zuG4mW+m3+OLdLI1anFoGI3+YNlv/cMmW3KMi7 yewg== X-Gm-Message-State: AOAM533Z3u/Oxx3jLz5+rqLdyYODHS0cUmguqrKPNHgf5OGlBv04MW4H kmmkiFAURsfPz6/DAgInBgBEeCYeRoS1Vw== X-Google-Smtp-Source: ABdhPJwghbeX0Le7A+LgGHxp1m5SlC9JPSo83DKfgOA9q3tjyI7x/vNeADNmwQbFtTAb/liJhHQjHw== X-Received: by 2002:a17:902:c3d2:b029:da:73c5:c589 with SMTP id j18-20020a170902c3d2b02900da73c5c589mr890098plj.71.1607493258789; Tue, 08 Dec 2020 21:54:18 -0800 (PST) Received: from hiroh.c.googlers.com.com (128.141.236.35.bc.googleusercontent.com. [35.236.141.128]) by smtp.gmail.com with ESMTPSA id oc13sm641275pjb.5.2020.12.08.21.54.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Dec 2020 21:54:18 -0800 (PST) From: Hirokazu Honda To: libcamera-devel@lists.libcamera.org Date: Wed, 9 Dec 2020 05:54:10 +0000 Message-Id: <20201209055410.3232987-3-hiroh@chromium.org> X-Mailer: git-send-email 2.29.2.576.ga3fc446d84-goog In-Reply-To: <20201209055410.3232987-1-hiroh@chromium.org> References: <20201209055410.3232987-1-hiroh@chromium.org> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v5 3/3] android: camera_device: Reorder configurations before requesting X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libcamera-devel-bounces@lists.libcamera.org Sender: "libcamera-devel" This reorders Camera3Configs before executing CameraConfiguration::validate() to make it easier for the Camera to satisfy the Android framework request. Signed-off-by: Hirokazu Honda Reviewed-by: Jacopo Mondi Reviewed-by: Kieran Bingham Reviewed-by: Umang Jain --- src/android/camera_device.cpp | 109 +++++++++++++++++++++++++++++++++- 1 file changed, 107 insertions(+), 2 deletions(-) -- 2.29.2.576.ga3fc446d84-goog diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp index b7bf3d88..c9e0ec98 100644 --- a/src/android/camera_device.cpp +++ b/src/android/camera_device.cpp @@ -9,6 +9,7 @@ #include "camera_ops.h" #include "post_processor.h" +#include #include #include #include @@ -27,6 +28,8 @@ using namespace libcamera; +LOG_DECLARE_CATEGORY(HAL) + namespace { /* @@ -140,9 +143,109 @@ struct Camera3StreamConfig { std::vector types; StreamConfiguration config; }; -} /* namespace */ -LOG_DECLARE_CATEGORY(HAL) +/* + * Reorder the configurations so that libcamera::Camera can accept them as much + * as possible. The sort rule is as follows. + * 1.) The configuration for NV12 request whose resolution is the largest. + * 2.) The configuration for JPEG request. + * 3.) Others. Larger resolutions and different formats are put earlier. + */ +std::vector sortCamera3StreamConfigs( + std::vector unsortedConfigs, + const camera3_stream_t *jpegStream) +{ + const size_t unsortedSize = unsortedConfigs.size(); + std::optional jpegConfig = std::nullopt; + + if (jpegStream) { + for (size_t i = 0; i < unsortedSize; ++i) { + const auto &streams = unsortedConfigs[i].streams; + if (std::find(streams.begin(), streams.end(), + jpegStream) != streams.end()) { + jpegConfig = std::move(unsortedConfigs[i]); + unsortedConfigs.erase(unsortedConfigs.begin() + i); + break; + } + } + if (!jpegConfig) + LOG(HAL, Fatal) << "No Camera3StreamConfig is found for Jpeg"; + } + + std::map> formatToConfigs; + for (const auto &streamConfig : unsortedConfigs) { + const StreamConfiguration &config = streamConfig.config; + formatToConfigs[config.pixelFormat].push_back(streamConfig); + + } + for (auto &[format, streamConfigs] : formatToConfigs) { + /* Sorted by resolution. Smaller is put first. */ + std::sort(streamConfigs.begin(), streamConfigs.end(), + [](const auto &streamConfigA, const auto &streamConfigB) { + const Size &sizeA = streamConfigA.config.size; + const Size &sizeB = streamConfigB.config.size; + return sizeA < sizeB; + }); + } + + std::vector sortedConfigs; + sortedConfigs.reserve(unsortedSize); + /* + * NV12 is the most prioritized format. Put the configuration with NV12 + * and the largest resolution first. + */ + const auto nv12It = formatToConfigs.find(formats::NV12); + if (nv12It != formatToConfigs.end()) { + auto &nv12Configs = nv12It->second; + const Size &nv12LargestSize = nv12Configs.back().config.size; + /* + * If JPEG will be created from NV12 and the size is larger than + * the largest NV12 configurations, then put the NV12 + * configuration for JPEG first. + */ + if (jpegConfig && jpegConfig->config.pixelFormat == formats::NV12) { + const Size &nv12SizeForJpeg = jpegConfig->config.size; + + if (nv12LargestSize < nv12SizeForJpeg) { + LOG(HAL, Debug) << "Insert " << jpegConfig->config.toString(); + sortedConfigs.push_back(std::move(*jpegConfig)); + jpegConfig = std::nullopt; + } + } + LOG(HAL, Debug) << "Insert " << nv12Configs.back().config.toString(); + sortedConfigs.push_back(std::move(nv12Configs.back())); + nv12Configs.pop_back(); + } + + /* If the configuration for JPEG is there, then put it. */ + if (jpegConfig) { + LOG(HAL, Debug) << "Insert " << jpegConfig->config.toString(); + sortedConfigs.push_back(std::move(*jpegConfig)); + jpegConfig = std::nullopt; + } + + /* + * Put configurations with different formats and larger resolutions + * earlier. + */ + while (!formatToConfigs.empty()) { + for (auto it = formatToConfigs.begin(); it != formatToConfigs.end();) { + auto& configs = it->second; + if (configs.empty()) { + it = formatToConfigs.erase(it); + continue; + } + LOG(HAL, Debug) << "Insert " << configs.back().config.toString(); + sortedConfigs.push_back(std::move(configs.back())); + configs.pop_back(); + it++; + } + } + assert(sortedConfigs.size() == unsortedSize); + + return sortedConfigs; +} +} /* namespace */ MappedCamera3Buffer::MappedCamera3Buffer(const buffer_handle_t camera3buffer, int flags) @@ -1333,6 +1436,8 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list) streamConfigs[index].types.push_back(type); } + streamConfigs = sortCamera3StreamConfigs(std::move(streamConfigs), + jpegStream); for (const auto &streamConfig : streamConfigs) { config_->addConfiguration(streamConfig.config); for (size_t i = 0; i < streamConfig.streams.size(); ++i) {