From patchwork Mon Dec 7 08:42:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hirokazu Honda X-Patchwork-Id: 10590 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 4DCE0BDB20 for ; Mon, 7 Dec 2020 10:44:46 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id D9ED467E18; Mon, 7 Dec 2020 11:44:45 +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="Ll7gTIdc"; dkim-atps=neutral Received: from mail-oi1-x233.google.com (mail-oi1-x233.google.com [IPv6:2607:f8b0:4864:20::233]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 9971F67E12 for ; Mon, 7 Dec 2020 11:44:44 +0100 (CET) Received: by mail-oi1-x233.google.com with SMTP id d27so7364372oic.0 for ; Mon, 07 Dec 2020 02:44:44 -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=5B3+4fHuXABlXZmpKC3ZgA6+5KHCXp2gsSEH09n1+nQ=; b=Ll7gTIdcdNe3WHItA7XbpnZfvFedEjwM8knaA6LTnCHS4/HkMh+rQ6/n+8uVYw6tCr GDp6G95XK3BXkVyP1QLh5PY9JFHhh0lacwi+PQwmq9GqQnnDiEiUcd+bxStMrYZm7Lvm nXMH9BtwFOFTtIie8XjI4LdNhcgdoFqxbKcsI= 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=5B3+4fHuXABlXZmpKC3ZgA6+5KHCXp2gsSEH09n1+nQ=; b=iJdTXLo0BxMXG3mz9b75kY+0AAPeEP3+CfOgAoGHBnVtkyA1cG3inZm6Z52kGNRA6a BpUdexOommO4UoSJNH1E5gotSRHXDpOxMUQDCajVKksMX+qWZdlYlmtKvoiyk4zFtKb9 ZAXET38Io1F0nhzhUJ1a08aRPhp0erBgpktzF9N6EQeUVB9JZs+AfSliuEfclAc6zSMt jMYrOhMlg3GgCyqjfNzFg6O9o+Uf4dQwRNbMenUZAej34UCCgC0Im85P/2f1wzPraq0X fknG79tybO2QD51lgR3NHRzEPrGVcba13sKo7/zJfP7xv/VG1d5oZdLHinby+nO9ya7Y dTKw== X-Gm-Message-State: AOAM531Uli1fFt5y8AE8/z3hXaC48szF7jLsPlx21bGMPqJai6hWTjui oDD1WACKi69dGOJQsHau5G7/+poPnVZFE2ne9Ks= X-Google-Smtp-Source: ABdhPJzaJdalaesUQmPIlathtcSondTtnNKDtIvPKIUZ9AuReMDfqlk1WqdB3ee3Yu5n2c/8wwkWcA== X-Received: by 2002:a17:90a:e64e:: with SMTP id ep14mr9019778pjb.5.1607330555266; Mon, 07 Dec 2020 00:42:35 -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 22sm12772144pfn.190.2020.12.07.00.42.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Dec 2020 00:42:34 -0800 (PST) From: Hirokazu Honda To: libcamera-devel@lists.libcamera.org Date: Mon, 7 Dec 2020 08:42:18 +0000 Message-Id: <20201207084218.2307410-3-hiroh@chromium.org> X-Mailer: git-send-email 2.29.2.576.ga3fc446d84-goog In-Reply-To: <20201207084218.2307410-1-hiroh@chromium.org> References: <20201207084218.2307410-1-hiroh@chromium.org> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v3 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. --- src/android/camera_device.cpp | 104 +++++++++++++++++++++++++++++++++- 1 file changed, 102 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..dcba4e7d 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,104 @@ struct Camera3StreamConfig { std::vector types; StreamConfiguration config; }; -} /* namespace */ -LOG_DECLARE_CATEGORY(HAL) +/* + * Reorder the configurations so that CameraDevice 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 unsortedStreamConfigs, + const camera3_stream_t *jpegStream) { + const size_t unsortedStreamConfigsSize = unsortedStreamConfigs.size(); + std::optional streamConfigForJpeg = std::nullopt; + if (jpegStream) { + for (auto it = unsortedStreamConfigs.begin(); + it != unsortedStreamConfigs.end(); it++) { + const auto &streams = it->streams; + if (std::find(streams.begin(), streams.end(), + jpegStream) != streams.end()) { + streamConfigForJpeg = *it; + unsortedStreamConfigs.erase(it); + break; + } + } + if (!streamConfigForJpeg) + LOG(HAL, Fatal) << "No Camera3StreamConfig is found for Jpeg"; + } + + std::map> formatToConfigs; + for (const auto &streamConfig : unsortedStreamConfigs) { + 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 sortedStreamConfigs; + sortedStreamConfigs.reserve(unsortedStreamConfigsSize); + /* + * NV12 is the most prioritized format. Put the configuration with NV12 + * and the largest resolution first. + */ + const auto nv12Stream = formatToConfigs.find(formats::NV12); + if (nv12Stream != formatToConfigs.end()) { + auto &nv12StreamConfigs = nv12Stream->second; + const Size &nv12LargestSize = nv12StreamConfigs.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 (streamConfigForJpeg && + streamConfigForJpeg->config.pixelFormat == formats::NV12) { + const Size &nv12SizeForJpeg = streamConfigForJpeg->config.size; + if (nv12LargestSize < nv12SizeForJpeg) { + sortedStreamConfigs.push_back(*streamConfigForJpeg); + streamConfigForJpeg = std::nullopt; + } + } + sortedStreamConfigs.push_back(nv12StreamConfigs.back()); + nv12StreamConfigs.pop_back(); + } + + /* If the configuration for JPEG is there, then put it. */ + if (streamConfigForJpeg) { + sortedStreamConfigs.push_back(*streamConfigForJpeg); + streamConfigForJpeg = std::nullopt; + } + + /* + * Put configurations with different formats and larger resolutions + * earlier. + */ + while (!formatToConfigs.empty()) { + for (auto it = formatToConfigs.begin(); it != formatToConfigs.end();) { + auto& streamConfigs = it->second; + if (streamConfigs.empty()) { + it = formatToConfigs.erase(it); + continue; + } + sortedStreamConfigs.push_back(streamConfigs.back()); + streamConfigs.pop_back(); + it++; + } + } + assert(sortedStreamConfigs.size() == unsortedStreamConfigsSize); + + return sortedStreamConfigs; +} +} /* namespace */ MappedCamera3Buffer::MappedCamera3Buffer(const buffer_handle_t camera3buffer, int flags) @@ -1333,6 +1431,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) {