From patchwork Thu Jan 21 10:15:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Elder X-Patchwork-Id: 10919 X-Patchwork-Delegate: paul.elder@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 ABD66C0F2A for ; Thu, 21 Jan 2021 10:16:17 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 77AC6681EB; Thu, 21 Jan 2021 11:16:17 +0100 (CET) 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="g5ABu5q/"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 704A3681C3 for ; Thu, 21 Jan 2021 11:16:15 +0100 (CET) Received: from pyrite.rasen.tech (unknown [IPv6:2400:4051:61:600:2c71:1b79:d06d:5032]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 01F4A50E; Thu, 21 Jan 2021 11:16:13 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1611224175; bh=zjFaEcw7z5dM5BSS+bjbQTTQ3ZLxS/0UdvDtOuf2rUo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=g5ABu5q/59wy/N95w88VuT69ZPsIQUptNuhHiclr/NodCKJebG8ot+83lS716BIYP o+auJ+2auK8EhHHPTwN0VrBxO9uqxhVSojf1kPHaJ5QHfdtawGO0gxQ2cI4d/Y6p3i NfrM0LTrKLWdMNw8Em7TIhOgeQCS7ZXqHnpBOWHU= From: Paul Elder To: libcamera-devel@lists.libcamera.org Date: Thu, 21 Jan 2021 19:15:47 +0900 Message-Id: <20210121101549.134574-8-paul.elder@ideasonboard.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210121101549.134574-1-paul.elder@ideasonboard.com> References: <20210121101549.134574-1-paul.elder@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 7/9] android: camera_device: Use CameraMetadata wrapper in processControls 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 CameraMetadata wrapper to access android request settings instead of accessing camera_metadata_t directly. Signed-off-by: Paul Elder --- New in v2 --- src/android/camera_device.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp index 16d5b472..49af221b 100644 --- a/src/android/camera_device.cpp +++ b/src/android/camera_device.cpp @@ -1639,12 +1639,10 @@ int CameraDevice::processControls(camera3_capture_request_t *camera3Request, * \todo As soon as more controls are handled, this part should be * broke out to a dedicated function. */ - const camera_metadata_t *camera3Settings = camera3Request->settings; + CameraMetadata camera3Settings(camera3Request->settings); camera_metadata_ro_entry_t entry; - int ret = find_camera_metadata_ro_entry(camera3Settings, - ANDROID_SCALER_CROP_REGION, - &entry); - if (!ret) { + int ret = camera3Settings.getEntry(ANDROID_SCALER_CROP_REGION, &entry); + if (ret) { const int32_t *data = entry.data.i32; Rectangle cropRegion = { data[0], data[1], static_cast(data[2]),