From patchwork Thu Jan 21 16:53:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacopo Mondi X-Patchwork-Id: 10933 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 C2EFCC0F2B for ; Thu, 21 Jan 2021 16:53:03 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 831AF6821E; Thu, 21 Jan 2021 17:53:03 +0100 (CET) Received: from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net [217.70.183.197]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 9FFBF68202 for ; Thu, 21 Jan 2021 17:52:58 +0100 (CET) X-Originating-IP: 93.34.118.233 Received: from uno.lan (93-34-118-233.ip49.fastwebnet.it [93.34.118.233]) (Authenticated sender: jacopo@jmondi.org) by relay5-d.mail.gandi.net (Postfix) with ESMTPSA id 317B21C0012; Thu, 21 Jan 2021 16:52:58 +0000 (UTC) From: Jacopo Mondi To: libcamera-devel@lists.libcamera.org, Paul Elder Date: Thu, 21 Jan 2021 17:53:03 +0100 Message-Id: <20210121165305.367801-6-jacopo@jmondi.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210121165305.367801-1-jacopo@jmondi.org> References: <20210121165305.367801-1-jacopo@jmondi.org> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 5/7] android: camera_device: Clone settings in request descriptor 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" When a Camera3RequestDescriptor instance is created to wrap a camera3_capture_request_t the settings associated with the request are cloned for later re-use. Signed-off-by: Jacopo Mondi Reviewed-by: Laurent Pinchart Reviewed-by: Paul Elder --- src/android/camera_device.cpp | 4 +++- src/android/camera_device.h | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp index 578fb2271a9e..9733c84612bd 100644 --- a/src/android/camera_device.cpp +++ b/src/android/camera_device.cpp @@ -22,7 +22,6 @@ #include "libcamera/internal/log.h" #include "libcamera/internal/utils.h" -#include "camera_metadata.h" #include "system/graphics.h" using namespace libcamera; @@ -311,6 +310,9 @@ CameraDevice::Camera3RequestDescriptor::Camera3RequestDescriptor( */ frameBuffers_.reserve(numBuffers_); + /* Clone the controls associated with the camera3 request. */ + settings_ = CameraMetadata(camera3Request->settings); + /* * Create the libcamera::Request unique_ptr<> to tie its lifetime * to the descriptor's one. Set the descriptor's address as the diff --git a/src/android/camera_device.h b/src/android/camera_device.h index ab3c848edd0a..bad3be8e8066 100644 --- a/src/android/camera_device.h +++ b/src/android/camera_device.h @@ -24,12 +24,11 @@ #include "libcamera/internal/log.h" #include "libcamera/internal/message.h" +#include "camera_metadata.h" #include "camera_stream.h" #include "camera_worker.h" #include "jpeg/encoder.h" -class CameraMetadata; - class MappedCamera3Buffer : public libcamera::MappedBuffer { public: @@ -82,6 +81,7 @@ private: uint32_t numBuffers_; camera3_stream_buffer_t *buffers_; std::vector> frameBuffers_; + CameraMetadata settings_; std::unique_ptr request_; };