From patchwork Thu Aug 19 20:12:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hirokazu Honda X-Patchwork-Id: 13407 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 53C5BBD87C for ; Thu, 19 Aug 2021 20:12:30 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 0E492688A2; Thu, 19 Aug 2021 22:12:30 +0200 (CEST) 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="HiZKte1X"; dkim-atps=neutral Received: from mail-pg1-x52f.google.com (mail-pg1-x52f.google.com [IPv6:2607:f8b0:4864:20::52f]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 150D368895 for ; Thu, 19 Aug 2021 22:12:29 +0200 (CEST) Received: by mail-pg1-x52f.google.com with SMTP id o2so6954383pgr.9 for ; Thu, 19 Aug 2021 13:12:29 -0700 (PDT) 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=qt28LBirf9ReQ6Me/Hn5otA8Z0Hc0euI0EXahyjtYfo=; b=HiZKte1XRurdXyBXvVbZmhoNn51q+dLRhOY7UGCG3aPpEinOU0Cab/uxph0UQNgsH5 xNFw7aP3bnZho1o5RRwUfxJ2PehXgJlTiImlADMgOrDwsHJbx9lEKOoHqIUJ3EzQbnEG RlN5XHyvrLgroYknbr4D4XSvi/mOBoCgBGzIk= 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=qt28LBirf9ReQ6Me/Hn5otA8Z0Hc0euI0EXahyjtYfo=; b=nC5icHV3zmeIbAaiBiyGhzrzLI8aHje0zLCgPROgaE2yuLT6Cdw/Lqqd4vFYFCga4c alnE56R1nIiK9aXVonTLE/IMlBG/S6KQKHbsYzFczntX0NJJz00r9NWb4ytgKo8gPQxC vnJGDj65h9/pmHvSGNS5VjiyVP+JmVJE9rKWxunmqDk9ayvmFN37ePyDOqwv2D4N3eBK 6ot0uHqJ5JMU1y8e5/ddO4b4ibIx2hJ5+sny79AfI0sD6eCp3gnrnYLDMuvZ+OQr36cv UjLzsONNmguRQHf6wiUivZOzw02+NkyrAxmTAD6k0+0D0Zu0O64emxh2TxzlWPkG2uHQ 9Q0w== X-Gm-Message-State: AOAM533SZBpGFKsmlNhNUYa+Ugx5k3IbXdbCcqg3ukgndS/DQmvMY54g +YaMfW0WAsA2fR/S2LLtaQAy4IC3TBusig== X-Google-Smtp-Source: ABdhPJzXwkuP/oBddD3/WNogHhsiu4ZJF2PFoht4kog8StQV36dQ0Jr/jujQPUICYRp6Hlc9yIWeeQ== X-Received: by 2002:a65:6658:: with SMTP id z24mr15441101pgv.266.1629403947369; Thu, 19 Aug 2021 13:12:27 -0700 (PDT) Received: from hiroh2.tok.corp.google.com ([2401:fa00:8f:203:4298:71ae:6ebb:72eb]) by smtp.gmail.com with ESMTPSA id i11sm4303695pfo.29.2021.08.19.13.12.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Aug 2021 13:12:26 -0700 (PDT) From: Hirokazu Honda To: libcamera-devel@lists.libcamera.org Date: Fri, 20 Aug 2021 05:12:14 +0900 Message-Id: <20210819201214.1554322-4-hiroh@chromium.org> X-Mailer: git-send-email 2.33.0.rc2.250.ged5fa647cd-goog In-Reply-To: <20210819201214.1554322-1-hiroh@chromium.org> References: <20210819201214.1554322-1-hiroh@chromium.org> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 3/3] android: camera_device: Configure one stream for identical stream requests 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" An Android HAL client may request identical stream requests. It is redundant that a native camera device produces a separate stream for each of the identical requests. Configure camera one stream configuration for the identical stream requests. Signed-off-by: Hirokazu Honda Reviewed-by: Jacopo Mondi --- src/android/camera_device.cpp | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp index a69b687a..88cfd117 100644 --- a/src/android/camera_device.cpp +++ b/src/android/camera_device.cpp @@ -617,14 +617,32 @@ int CameraDevice::configureStreams(camera3_stream_configuration_t *stream_list) continue; } + /* This stream will be produced by hardware. */ + stream->usage |= GRALLOC_USAGE_HW_CAMERA_WRITE; + + /* + * If a CameraStream with the same size and format of the + * current stream has already been requested, associate the two. + */ + auto iter = std::find_if( + streamConfigs.begin(), streamConfigs.end(), + [size, format](const Camera3StreamConfig &streamConfig) { + return streamConfig.config.size == size && + streamConfig.config.pixelFormat == format; + }); + if (iter != streamConfigs.end()) { + /* Add usage to copy the buffer in streams[0] to stream. */ + iter->streams[0].stream->usage |= GRALLOC_USAGE_SW_READ_OFTEN; + stream->usage |= GRALLOC_USAGE_SW_WRITE_OFTEN; + iter->streams.push_back({ stream, CameraStream::Type::Mapped }); + continue; + } + Camera3StreamConfig streamConfig; streamConfig.streams = { { stream, CameraStream::Type::Direct } }; streamConfig.config.size = size; streamConfig.config.pixelFormat = format; streamConfigs.push_back(std::move(streamConfig)); - - /* This stream will be produced by hardware. */ - stream->usage |= GRALLOC_USAGE_HW_CAMERA_WRITE; } /* Now handle the MJPEG streams, adding a new stream if required. */ @@ -1077,6 +1095,7 @@ void CameraDevice::requestComplete(Request *request) camera3_capture_result_t captureResult = {}; captureResult.frame_number = descriptor.frameNumber_; captureResult.num_output_buffers = descriptor.buffers_.size(); + /* Handle post-processing. */ for (camera3_stream_buffer_t &buffer : descriptor.buffers_) { buffer.acquire_fence = -1; buffer.release_fence = -1; @@ -1132,12 +1151,11 @@ void CameraDevice::requestComplete(Request *request) resultMetadata = std::make_unique(0, 0); } - /* Handle any JPEG compression. */ for (camera3_stream_buffer_t &buffer : descriptor.buffers_) { CameraStream *cameraStream = static_cast(buffer.stream->priv); - if (cameraStream->camera3Stream().format != HAL_PIXEL_FORMAT_BLOB) + if (cameraStream->type() == CameraStream::Type::Direct) continue; FrameBuffer *src = request->findBuffer(cameraStream->stream());