From patchwork Wed Dec 9 05:54:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hirokazu Honda X-Patchwork-Id: 10621 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 82C70BDE19 for ; Wed, 9 Dec 2020 05:54:21 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 561BF67F35; 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="MKNylucY"; dkim-atps=neutral Received: from mail-pl1-x644.google.com (mail-pl1-x644.google.com [IPv6:2607:f8b0:4864:20::644]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id C114967F30 for ; Wed, 9 Dec 2020 06:54:18 +0100 (CET) Received: by mail-pl1-x644.google.com with SMTP id t18so380252plo.0 for ; Tue, 08 Dec 2020 21:54:18 -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=6VIwJqNsRrz20X5OvIZRqQ98fMAo2kwuGK5JAcIcoNI=; b=MKNylucY2CpiAPRwVSt0DfY9Gik7LE8t5kNPmw6UZoGvmQRhVnwsMAVXMBYNWhMbG/ MYHFIrMouGLjZxGK8j2ZK86Gg/Df6k8Ve6pb/e5GSVFYITTm7+ZKT9n3kXNGbmhvG4Zs OSVJ8x2ojm/yUzGyftclF5RS9Mn4zMuJei0n8= 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=6VIwJqNsRrz20X5OvIZRqQ98fMAo2kwuGK5JAcIcoNI=; b=Fh6p1wv+q+yAEUIU8Go9JCkIXSoXib/d9RgtUiuGOMw+LQ7h2+gh7SarjCSAcmF4Mp VKhSy5OUeONXNtm3fznMC4zt0IaVkp9dLvEPTWeLX0lEyHocdX/q59Ux3DfysNqcK2AU hLvF9XAZ3vmMqJ9RXuYq4ArdxLEoj2AXp90BxkZMPMTVWNKcM2GVI+TDMTmy1MbvAjq/ GDRxY0PmuuEXnC2Mts8baH+zJuVYRRPlBWPYCt+lgRvgDqixl1r5pckO8a1xqjhI88nb X1lXBPhjNxYBZvikpmSRusjb0bMbuLpJRiI7M48W3X1yvkMGlO+qaz077850NzMG28un sC9w== X-Gm-Message-State: AOAM532lp90D9ZEh/VfXZHiKgIu+rpXQHoSd3n2Mu8Gk1hNFE3dLHWwI khst4//OD1GyxDRMbUq6xJTrwUvSge4L9A== X-Google-Smtp-Source: ABdhPJy6jfdWH08ZYDiJ11GEcw5qWR3Iazcn0mBLEfKtnXnxIHv5wPfpnb51sLdpApY1hrM1lYWYtA== X-Received: by 2002:a17:90a:6842:: with SMTP id e2mr773777pjm.190.1607493257156; Tue, 08 Dec 2020 21:54:17 -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.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Dec 2020 21:54:16 -0800 (PST) From: Hirokazu Honda To: libcamera-devel@lists.libcamera.org Date: Wed, 9 Dec 2020 05:54:09 +0000 Message-Id: <20201209055410.3232987-2-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 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 | 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()) {