From patchwork Mon Dec 7 08:42:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hirokazu Honda X-Patchwork-Id: 10591 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 CCBCDBDB1F for ; Mon, 7 Dec 2020 10:46:30 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 7F49A67E16; Mon, 7 Dec 2020 11:46:30 +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="LhV6aHDd"; dkim-atps=neutral Received: from mail-oi1-x241.google.com (mail-oi1-x241.google.com [IPv6:2607:f8b0:4864:20::241]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id EB5F967E12 for ; Mon, 7 Dec 2020 11:46:28 +0100 (CET) Received: by mail-oi1-x241.google.com with SMTP id s75so11837019oih.1 for ; Mon, 07 Dec 2020 02:46:28 -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=XCfAms3h7myBvNieIr+PFbFvvDNnue+uTz5FCau7AXY=; b=LhV6aHDdp2sJw9gJRxKrdWQZV7CafCE9IjlCHWDwfPQZhAQCUF8bnda+SIbsF/HuZb 3MUmu6fEUrFTVEyb3xdAmt5wcB05NyU1VlUAVSaBArn9emUuG+Zpot5h2rfkaQ/Xtk1K ZXNdMvcUbqA0ElLC9kPJ4/kVVfmA26yjuFhGk= 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=XCfAms3h7myBvNieIr+PFbFvvDNnue+uTz5FCau7AXY=; b=rtMKGtGBb5SjqQ2ODu3DFkbF9XKnAfqcY503k3YGnVIn1x61VYHoyajuyAHMhJeBas mJuK1soVvNaaQQ+eI3iwue2YqATPLq3LSE28aiCDGUHjGySHbG8fpDEHHZoAXGc4b1xD Nk7m+Gbnlq5yrrbBbemZZhBwpMyQ33JOkOqOoc2zjByHQVZpL/n3x9PDMJ8zHUsUruW6 1jJ0ND4cB3m+iUgcVXjUDDp/fl02DCnyvkhk8I91h3IQyojudyece1bkbEpfiyfsNaJx YfJOZ8ScoyQUBMZmFwkMt5CNfv29t/ayW1/xaK2GVo6Fh7rGdNXgZRU03NYzUqfqcYuX dbSA== X-Gm-Message-State: AOAM530eQXG8zoOWphWjtck5AlFGLKo4Lxc4CiwsdiSnNuRwt9+/sc8+ 5yGXOn4+tJFnk3SyLq66TnfVOSX0x6pYRqTbTfc= X-Google-Smtp-Source: ABdhPJy+WtawKqbAPa8CyMyimbdNuv7Tjn4EMPabU6TUVI6jsXsn6bwv/5WcSpLN22fqfuvTbO4oyQ== X-Received: by 2002:a17:90a:882:: with SMTP id v2mr15783359pjc.36.1607330553681; Mon, 07 Dec 2020 00:42:33 -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.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Dec 2020 00:42:33 -0800 (PST) From: Hirokazu Honda To: libcamera-devel@lists.libcamera.org Date: Mon, 7 Dec 2020 08:42:17 +0000 Message-Id: <20201207084218.2307410-2-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 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" This uses Camera3StreamConfig in CameraDevice::configureStreams(). --- src/android/camera_device.cpp | 52 +++++++++++++++++++++-------------- 1 file changed, 31 insertions(+), 21 deletions(-) -- 2.29.2.576.ga3fc446d84-goog diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp index 09269d95..b7bf3d88 100644 --- a/src/android/camera_device.cpp +++ b/src/android/camera_device.cpp @@ -1240,6 +1240,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) { @@ -1270,14 +1273,12 @@ 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 }; + streamConfig.types = { 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. */ @@ -1286,9 +1287,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 * the encoder. @@ -1310,28 +1310,38 @@ 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); + streamConfigs[index].types.push_back(type); + } + + for (const auto &streamConfig : streamConfigs) { + config_->addConfiguration(streamConfig.config); + for (size_t i = 0; i < streamConfig.streams.size(); ++i) { + camera3_stream_t *stream = streamConfig.streams[i]; + const CameraStream::Type type = streamConfig.types[i]; + streams_.emplace_back(this, type, + stream, config_->size() - 1); + stream->priv = static_cast(&streams_.back()); + } } switch (config_->validate()) {