From patchwork Mon Sep 20 17:37:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Umang Jain X-Patchwork-Id: 13869 X-Patchwork-Delegate: umang.jain@ideasonboard.com 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 0971DBF01C for ; Mon, 20 Sep 2021 17:38:14 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 8D46569192; Mon, 20 Sep 2021 19:38:13 +0200 (CEST) Authentication-Results: lancelot.ideasonboard.com; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="L8fEnt+L"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 1BADF69186 for ; Mon, 20 Sep 2021 19:38:11 +0200 (CEST) Received: from perceval.ideasonboard.com (unknown [103.251.226.144]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 29CB445E; Mon, 20 Sep 2021 19:38:09 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1632159490; bh=3mnJFgNfPkK7W75ia59SaYjzKYVr84p1f8A8s0Hprhk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=L8fEnt+LERMX2HtMjY9F6VMZUxqwkDrIwATBcwv3dCCds7j33U69N+8Bd15lhuROF ki4xMISyPrmh+PFTJAwiYUGxxPYhwvUYxsGMzR0hDhLFOD99ZGbxUA9B3Flw+Ac9eS NoJi2TQ9WcGgQA9VPRFtSOlWju6L4kJUxGYkz7dQ= From: Umang Jain To: libcamera-devel@lists.libcamera.org Date: Mon, 20 Sep 2021 23:07:47 +0530 Message-Id: <20210920173752.1346190-6-umang.jain@ideasonboard.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210920173752.1346190-1-umang.jain@ideasonboard.com> References: <20210920173752.1346190-1-umang.jain@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v3 05/10] android: camera_device: Store results metadata into Camera3RequestDescriptor 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" Store metadata which is sent as capture results into the Camera3RequestDescriptor. This is will remove the need to send the result metadata pointer separately to CameraStream::process(). In the subsequent commit, a Camera3RequestDescriptor pointer will be passed to CameraStream::process() and the result metadata can be directly accessed from there. Signed-off-by: Umang Jain Reviewed-by: Laurent Pinchart Reviewed-by: Hirokazu Honda --- src/android/camera_device.cpp | 6 ++++-- src/android/camera_device.h | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp index 3d6a2bed..1ae4ac73 100644 --- a/src/android/camera_device.cpp +++ b/src/android/camera_device.cpp @@ -1131,6 +1131,8 @@ void CameraDevice::requestComplete(Request *request) resultMetadata = std::make_unique(0, 0); } + descriptor->resultMetadata_ = std::move(resultMetadata); + /* Handle any JPEG compression. */ for (camera3_stream_buffer_t &buffer : descriptor->buffers_) { CameraStream *cameraStream = @@ -1150,7 +1152,7 @@ void CameraDevice::requestComplete(Request *request) int ret = cameraStream->process(src, *buffer.buffer, descriptor->settings_, - resultMetadata.get()); + descriptor->resultMetadata_.get()); /* * Return the FrameBuffer to the CameraStream now that we're * done processing it. @@ -1165,7 +1167,7 @@ void CameraDevice::requestComplete(Request *request) } } - captureResult.result = resultMetadata->get(); + captureResult.result = descriptor->resultMetadata_->get(); callbacks_->process_capture_result(callbacks_, &captureResult); descriptors_.pop_front(); diff --git a/src/android/camera_device.h b/src/android/camera_device.h index 59d6cd39..b2871e52 100644 --- a/src/android/camera_device.h +++ b/src/android/camera_device.h @@ -47,6 +47,7 @@ struct Camera3RequestDescriptor { std::vector> frameBuffers_; CameraMetadata settings_; std::unique_ptr request_; + std::unique_ptr resultMetadata_; }; class CameraDevice : protected libcamera::Loggable