From patchwork Sat Dec 12 00:41:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hirokazu Honda X-Patchwork-Id: 10653 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 9655FBD808 for ; Sat, 12 Dec 2020 01:39:36 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id EA6C5746F0; Sat, 12 Dec 2020 02:39:35 +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="Ug7GFNaU"; dkim-atps=neutral Received: from mail-vs1-xe44.google.com (mail-vs1-xe44.google.com [IPv6:2607:f8b0:4864:20::e44]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 2DAC968053 for ; Sat, 12 Dec 2020 02:39:34 +0100 (CET) Received: by mail-vs1-xe44.google.com with SMTP id u7so5832440vsg.11 for ; Fri, 11 Dec 2020 17:39:34 -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:mime-version :content-transfer-encoding; bh=IyosWRtwBOSokEIMBoa511MH2JrPPvE2nFDDSk4QwmU=; b=Ug7GFNaULEi4oG30PMsnK/eyrOHcIFDTSIRfDOiizhmJyK/MQdn8WsY2/IDczxwlUF alTg8vMvUL32Tc24ex3EpyI8HWM6Mw/v6UFx7NeSwx7YkCNGGdHCs7df3AUGmg/G0Ai8 PAW5PSaLpFLtzs01XcZII/eBH863R3MHKeyMc= 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:mime-version :content-transfer-encoding; bh=IyosWRtwBOSokEIMBoa511MH2JrPPvE2nFDDSk4QwmU=; b=s8gvBV/VS1PvMbn1NpSajbIlHeE4WdUT9CLxy5Ki5FNFaByivfplRf9lwye+0RFIKQ HwyDxp7u2Xm3gM9PF9nIcuD8bq/eX9SzRxS8yhOvzMQGdy1gb2sDSsvdcPo6uGKWh5JC hYam7Ikh7Zt1B0GeSZJuOjz0PZiINkEM6RCATxdtCZ1BnocV8I3eDV7paHanuJcjIiG1 0DXUhFHU59D/4SF7sR1JObW7cXgUik/KQLfL+dUtWE2gM1ly0ax9qmMgRADW6lp/d5vb tLIMiJz0njjGLFEza4EtqleZzHeU/84OTZyzxqlRN+EvZ6csCJTWH4gA2SxKGcMv/b2G MmMQ== X-Gm-Message-State: AOAM533gzNEnfyZ215WbFKFwJegAj+KKHL7W68+JgGCe//scMZAADDVG LsN2vG1cMAy2SPjJy1lvFgOxysjoFoqZBdJI X-Google-Smtp-Source: ABdhPJw8YAblTWSgrWrKpkOlOyc7SRF30lQq+Te4oWLHj1nu6G0thLtK+xqQtZboMfANrFlFyosNyA== X-Received: by 2002:a17:902:a986:b029:db:cb2b:8bdb with SMTP id bh6-20020a170902a986b02900dbcb2b8bdbmr3615449plb.40.1607733715096; Fri, 11 Dec 2020 16:41:55 -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 x188sm11558534pfd.43.2020.12.11.16.41.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Dec 2020 16:41:54 -0800 (PST) From: Hirokazu Honda To: libcamera-devel@lists.libcamera.org Date: Sat, 12 Dec 2020 00:41:47 +0000 Message-Id: <20201212004149.158801-1-hiroh@chromium.org> X-Mailer: git-send-email 2.29.2.576.ga3fc446d84-goog MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v8 1/3] android: camera_device: Introduce Camera3StreamConfig 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" Camera3StreamConfig is a new class to store camera3_stream and types with associated StreamConfiguration. Signed-off-by: Hirokazu Honda Reviewed-by: Jacopo Mondi Reviewed-by: Kieran Bingham Reviewed-by: Umang Jain Reviewed-by: Laurent Pinchart --- src/android/camera_device.cpp | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) -- 2.29.2.576.ga3fc446d84-goog diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp index 872c7b18..f4a6fb6b 100644 --- a/src/android/camera_device.cpp +++ b/src/android/camera_device.cpp @@ -128,6 +128,22 @@ const std::map camera3FormatsMap = { }, }; +/* + * \struct Camera3StreamConfig + * \brief Data to store StreamConfiguration associated with camera3_stream(s). + * \var streams List of the pairs of a stream requested by Android HAL client + * and CameraStream::Type associated with the stream. + * \var config StreamConfiguration for streams. + */ +struct Camera3StreamConfig { + struct Camera3Stream { + camera3_stream_t *stream; + CameraStream::Type type; + }; + + std::vector streams; + StreamConfiguration config; +}; } /* namespace */ LOG_DECLARE_CATEGORY(HAL) From patchwork Sat Dec 12 00:41:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hirokazu Honda X-Patchwork-Id: 10652 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 957C6BD80A for ; Sat, 12 Dec 2020 01:31:41 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 0B97E68054; Sat, 12 Dec 2020 02:31:41 +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="KwJFAE3M"; dkim-atps=neutral Received: from mail-pg1-x544.google.com (mail-pg1-x544.google.com [IPv6:2607:f8b0:4864:20::544]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id DE45268053 for ; Sat, 12 Dec 2020 02:31:38 +0100 (CET) Received: by mail-pg1-x544.google.com with SMTP id w4so8349563pgg.13 for ; Fri, 11 Dec 2020 17:31:38 -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=yoK5XFHb4HhZWfB4dpOlsDWxHSKmTJdiIr+Nywe5htw=; b=KwJFAE3MNkZBphNYC87+9UbYty5mYeW5guqwgSKGoN85veVZZutgcGaYqpsRPd4J10 Y8HtYJqZZlRyODcip/tkhO564/uNnQAEfg11qIPDymVW2/V76945i0rfVF7ifoqpo1j1 9b4QTr3ZHInCUhRPS4imDnsNufRo0DJBaVAe4= 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=yoK5XFHb4HhZWfB4dpOlsDWxHSKmTJdiIr+Nywe5htw=; b=V7fDL6fK/I7XGgAknCNFMoXDfh0wb1CQt24htZGb8T9Yl8jePEgOZ2AUFYbtoH3AKb 8/FC7dZR+1CUKWj4AulHoQiTf4sPfSUON/h08uc99MNnM4BU62hw9NrXFnXaiRH9f0IK G6owmu7GkY1maLRf+4cYgwM8upPO1XybUdPs6RJ5NQ2jiKv2LR7oV+S6a4zDHn9FZ8yp d63ivJQ8FLcgCzq94fvSpXW1vBWqhHNFRKNKcaEgbRWIdeD+EHybugrQNa42bPHuop7s 7RaBcsL58UBSk4XYdXzyOksO3+D1Vn1sU+RdT2apxfBWb6VPbCOG2104yPwYxtrN330Y sxpA== X-Gm-Message-State: AOAM531Gqjz0ZeLbDceOIh2on837sEbx2EFoKC8bRZp/CMZ8zQAQdAHO 8+X6crSErI9tb/RhVjGsyk8ylfoIVdptsl6R X-Google-Smtp-Source: ABdhPJzfqWiocUIvj+eIeyWhRYWXBRLqNN27rsD410zi/YIv3vjD81Wf+LUbK+AdA++oOV7ujg4Srw== X-Received: by 2002:a63:c04b:: with SMTP id z11mr13569054pgi.74.1607733717045; Fri, 11 Dec 2020 16:41:57 -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 x188sm11558534pfd.43.2020.12.11.16.41.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Dec 2020 16:41:56 -0800 (PST) From: Hirokazu Honda To: libcamera-devel@lists.libcamera.org Date: Sat, 12 Dec 2020 00:41:48 +0000 Message-Id: <20201212004149.158801-2-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 2/3] android: camera_device: Use Camera3StreamConfig in configureStreams() 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" Use the newly introduced Camera3StreamConfig to associate the Android requested streams with the associated StreamConfiguration in a vector of configurations. This change prepares to sort the vector of configuration before using it to configure the Camera and populate the streams_ vector. No functional changes intended. Signed-off-by: Hirokazu Honda Reviewed-by: Jacopo Mondi Reviewed-by: Kieran Bingham Reviewed-by: Umang Jain Reviewed-by: Laurent Pinchart --- src/android/camera_device.cpp | 48 ++++++++++++++++++++--------------- 1 file changed, 28 insertions(+), 20 deletions(-) -- 2.29.2.576.ga3fc446d84-goog diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp index f4a6fb6b..7e8b2818 100644 --- a/src/android/camera_device.cpp +++ b/src/android/camera_device.cpp @@ -1264,6 +1264,9 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list) streams_.clear(); streams_.reserve(stream_list->num_streams); + std::vector streamConfigs; + streamConfigs.reserve(stream_list->num_streams); + /* First handle all non-MJPEG streams. */ camera3_stream_t *jpegStream = nullptr; for (unsigned int i = 0; i < stream_list->num_streams; ++i) { @@ -1294,14 +1297,11 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list) continue; } - StreamConfiguration streamConfiguration; - streamConfiguration.size = size; - streamConfiguration.pixelFormat = format; - - config_->addConfiguration(streamConfiguration); - streams_.emplace_back(this, CameraStream::Type::Direct, - stream, config_->size() - 1); - stream->priv = static_cast(&streams_.back()); + Camera3StreamConfig streamConfig; + streamConfig.streams = { { stream, CameraStream::Type::Direct } }; + streamConfig.config.size = size; + streamConfig.config.pixelFormat = format; + streamConfigs.push_back(std::move(streamConfig)); } /* Now handle the MJPEG streams, adding a new stream if required. */ @@ -1310,8 +1310,8 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list) int index = -1; /* Search for a compatible stream in the non-JPEG ones. */ - for (unsigned int i = 0; i < config_->size(); i++) { - StreamConfiguration &cfg = config_->at(i); + for (size_t i = 0; i < streamConfigs.size(); ++i) { + const auto &cfg = streamConfigs[i].config; /* * \todo The PixelFormat must also be compatible with @@ -1334,28 +1334,36 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list) * introduce a new stream to satisfy the request requirements. */ if (index < 0) { - StreamConfiguration streamConfiguration; - /* * \todo The pixelFormat should be a 'best-fit' choice * and may require a validation cycle. This is not yet * handled, and should be considered as part of any * stream configuration reworks. */ - streamConfiguration.size.width = jpegStream->width; - streamConfiguration.size.height = jpegStream->height; - streamConfiguration.pixelFormat = formats::NV12; + Camera3StreamConfig streamConfig; + streamConfig.config.size.width = jpegStream->width; + streamConfig.config.size.height = jpegStream->height; + streamConfig.config.pixelFormat = formats::NV12; + streamConfigs.push_back(std::move(streamConfig)); - LOG(HAL, Info) << "Adding " << streamConfiguration.toString() + LOG(HAL, Info) << "Adding " << streamConfig.config.toString() << " for MJPEG support"; type = CameraStream::Type::Internal; - config_->addConfiguration(streamConfiguration); - index = config_->size() - 1; + index = streamConfigs.size() - 1; } - streams_.emplace_back(this, type, jpegStream, index); - jpegStream->priv = static_cast(&streams_.back()); + streamConfigs[index].streams.push_back({ jpegStream, type }); + } + + for (const auto &streamConfig : streamConfigs) { + config_->addConfiguration(streamConfig.config); + + for (auto &stream : streamConfig.streams) { + streams_.emplace_back(this, stream.type, stream.stream, + config_->size() - 1); + stream.stream->priv = static_cast(&streams_.back()); + } } switch (config_->validate()) { From patchwork Sat Dec 12 00:41:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hirokazu Honda X-Patchwork-Id: 10651 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 C619CBD80A for ; Sat, 12 Dec 2020 01:12:40 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 41B0F746F0; Sat, 12 Dec 2020 02:12:40 +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="fW7p1zEo"; dkim-atps=neutral Received: from mail-vs1-xe2c.google.com (mail-vs1-xe2c.google.com [IPv6:2607:f8b0:4864:20::e2c]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id BAAE468053 for ; Sat, 12 Dec 2020 02:12:36 +0100 (CET) Received: by mail-vs1-xe2c.google.com with SMTP id w18so5801252vsk.12 for ; Fri, 11 Dec 2020 17:12:36 -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=mrhlPWp8sVUtRnP/iC6DtmwkaemYBaUVHJT6rsBtREE=; b=fW7p1zEobdCx8rRDZ+pdnKnEEC1Tbj8RnrUBFmvUuSBo04jY9K61AucMVeKbqlLpsC ETBDCL9VEpcDkVuoOPQ7BQ3n4LovpahVZgkxI8w/eDZhu05ZjOBYkFjPMWHldf+6aUE5 Js8LystEXR4nN9MHQ7eiGu5YmROa3rvJMXSfY= 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=mrhlPWp8sVUtRnP/iC6DtmwkaemYBaUVHJT6rsBtREE=; b=jY0xHqz1Z2G3FSsACgXDwT40+yZBaMxEkuiiUTcEcmAGB/7DJmhO1W4UFU2/Z4XHtg dtXfMQdENhAbKNo63cyuImDbHqm8RB94eQ5xBc91BUY7oVX6fUQOPwAZXfAc34qM8611 Bu3/nXlw+kqIG9/1ZaN7DSIdyH9aNijj0in88j3eyt21V5RRjd5HDNkHGii+PTQw7hJP 7I0tmG1UfQz7gzTwikk7CsnRoIFMPF1IyZLRsFzDFoKNL7fiebsO6rgg5QFFXQh5lAoo 7V+cqmfOkFofKEBJMer1WMYnFkQ+AGMOw7+96ye+XN7r6FyCobAncu3BvzT/epBcoa+2 DALA== X-Gm-Message-State: AOAM531GSbiLCvmhpwqTd1D/DtwGS78mOJsRgHKRWvH+mSfvD1cDO1/3 78eZbk859iQR6+gQ0CFZGG230dVonz0tN+Tz X-Google-Smtp-Source: ABdhPJxk5GIvcZomG002r6aNwl/NnkL4VwFzt5OjnscswBzNnFQBKAAX3w7Ad4Up7Ah5gf+idD4B5A== X-Received: by 2002:a62:e213:0:b029:19e:59d3:a76a with SMTP id a19-20020a62e2130000b029019e59d3a76amr5526097pfi.53.1607733718943; Fri, 11 Dec 2020 16:41:58 -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 x188sm11558534pfd.43.2020.12.11.16.41.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 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 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 Reviewed-by: Laurent Pinchart --- src/android/camera_device.cpp | 113 +++++++++++++++++++++++++++++++++- 1 file changed, 111 insertions(+), 2 deletions(-) -- 2.29.2.576.ga3fc446d84-goog diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp index 7e8b2818..0b68a927 100644 --- a/src/android/camera_device.cpp +++ b/src/android/camera_device.cpp @@ -27,6 +27,8 @@ using namespace libcamera; +LOG_DECLARE_CATEGORY(HAL) + namespace { /* @@ -144,9 +146,115 @@ struct Camera3StreamConfig { std::vector streams; 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. + */ +void sortCamera3StreamConfigs(std::vector &unsortedConfigs, + const camera3_stream_t *jpegStream) +{ + const Camera3StreamConfig *jpegConfig = nullptr; + + std::map> formatToConfigs; + for (const auto &streamConfig : unsortedConfigs) { + if (jpegStream && !jpegConfig) { + const auto &streams = streamConfig.streams; + if (std::find_if(streams.begin(), streams.end(), + [jpegStream](const auto &stream) { + return stream.stream == jpegStream; + }) != streams.end()) { + jpegConfig = &streamConfig; + continue; + } + } + formatToConfigs[streamConfig.config.pixelFormat].push_back(&streamConfig); + } + if (jpegStream && !jpegConfig) + LOG(HAL, Fatal) << "No Camera3StreamConfig is found for JPEG"; + + for (auto &fmt : formatToConfigs) { + auto &streamConfigs = fmt.second; + + /* 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(unsortedConfigs.size()); + + /* + * 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 Camera3StreamConfig *nv12Largest = nv12Configs.back(); + + /* + * 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; + const Size &nv12LargestSize = nv12Largest->config.size; + + if (nv12LargestSize < nv12SizeForJpeg) { + LOG(HAL, Debug) << "Insert " << jpegConfig->config.toString(); + sortedConfigs.push_back(std::move(*jpegConfig)); + jpegConfig = nullptr; + } + } + + LOG(HAL, Debug) << "Insert " << nv12Largest->config.toString(); + sortedConfigs.push_back(*nv12Largest); + nv12Configs.pop_back(); + + if (nv12Configs.empty()) + formatToConfigs.erase(nv12It); + } + + /* 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 = nullptr; + } + + /* + * Put configurations with different formats and larger resolutions + * earlier. + */ + while (!formatToConfigs.empty()) { + for (auto it = formatToConfigs.begin(); it != formatToConfigs.end();) { + auto &configs = it->second; + LOG(HAL, Debug) << "Insert " << configs.back()->config.toString(); + sortedConfigs.push_back(*configs.back()); + configs.pop_back(); + + if (configs.empty()) + it = formatToConfigs.erase(it); + else + it++; + } + } + + ASSERT(sortedConfigs.size() == unsortedConfigs.size()); + + unsortedConfigs = sortedConfigs; +} + +} /* namespace */ MappedCamera3Buffer::MappedCamera3Buffer(const buffer_handle_t camera3buffer, int flags) @@ -1356,6 +1464,7 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list) streamConfigs[index].streams.push_back({ jpegStream, type }); } + sortCamera3StreamConfigs(streamConfigs, jpegStream); for (const auto &streamConfig : streamConfigs) { config_->addConfiguration(streamConfig.config);