From patchwork Fri Jul 16 10:56:24 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Elder X-Patchwork-Id: 13020 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 7C1E6C3228 for ; Fri, 16 Jul 2021 10:57:20 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 35D8668542; Fri, 16 Jul 2021 12:57:20 +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="tK1MHHH0"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id F1BD968545 for ; Fri, 16 Jul 2021 12:57:17 +0200 (CEST) Received: from pyrite.rasen.tech (unknown [IPv6:2400:4051:61:600:2c71:1b79:d06d:5032]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 78D023F0; Fri, 16 Jul 2021 12:57:16 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1626433037; bh=kQNOmt7D2sHNsqsTtwPW/dV4KEhFjMPAOUTCQBJ0j0g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tK1MHHH0RsPw8d/4K1cONjOae5nxIbvnkm37HMB6pt2k0147noxSGrbsYky07TmWD UEi1dFXypzn6HoBbu3WVpzhEmgx0O0RHEw7owu9SGCZuUCO8XERf1YwdUB5jF8xTAk ny/kc5hEsa9nr/IfCyeaL1XSqbY4lQNXR2TIKBy4= From: Paul Elder To: libcamera-devel@lists.libcamera.org Date: Fri, 16 Jul 2021 19:56:24 +0900 Message-Id: <20210716105631.158153-15-paul.elder@ideasonboard.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210716105631.158153-1-paul.elder@ideasonboard.com> References: <20210716105631.158153-1-paul.elder@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [RFC PATCH v4 14/21] android: Plumb AeLock control 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" Plumb the AeLock control into the HAL for CONTROL_AE_LOCK_AVAILABLE_MODES for static metadata. Bug: https://bugs.libcamera.org/show_bug.cgi?id=43 Signed-off-by: Paul Elder TODO: check templates --- Changes in v4: - remove capability check - plumb into processControls Changes in v3: - use new setMetadata - rebase on camera capabilities refactor --- src/android/camera_capabilities.cpp | 9 ++++++--- src/android/camera_device.cpp | 11 ++++++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/android/camera_capabilities.cpp b/src/android/camera_capabilities.cpp index fe81c665..ac3d88b5 100644 --- a/src/android/camera_capabilities.cpp +++ b/src/android/camera_capabilities.cpp @@ -934,9 +934,12 @@ int CameraCapabilities::initializeStaticMetadata() staticMetadata_->addEntry(ANDROID_CONTROL_SCENE_MODE_OVERRIDES, sceneModesOverride); - uint8_t aeLockAvailable = ANDROID_CONTROL_AE_LOCK_AVAILABLE_FALSE; - staticMetadata_->addEntry(ANDROID_CONTROL_AE_LOCK_AVAILABLE, - aeLockAvailable); + setMetadata( + staticMetadata_.get(), + ANDROID_CONTROL_AE_LOCK_AVAILABLE, + controlsInfo, &controls::AeLock, + ControlRange::Max, + ANDROID_CONTROL_AE_LOCK_AVAILABLE_FALSE); uint8_t awbLockAvailable = ANDROID_CONTROL_AWB_LOCK_AVAILABLE_FALSE; staticMetadata_->addEntry(ANDROID_CONTROL_AWB_LOCK_AVAILABLE, diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp index 98a73b37..1721e0e8 100644 --- a/src/android/camera_device.cpp +++ b/src/android/camera_device.cpp @@ -784,6 +784,9 @@ int CameraDevice::processControls(Camera3RequestDescriptor *descriptor) if (settings.getEntry(ANDROID_CONTROL_AE_MODE, &entry)) controls.set(controls::AeEnable, *entry.data.u8); + if (settings.getEntry(ANDROID_CONTROL_AE_LOCK, &entry)) + controls.set(controls::AeLock, *entry.data.u8); + return 0; } @@ -1205,14 +1208,16 @@ CameraDevice::getResultMetadata(const Camera3RequestDescriptor &descriptor) cons resultMetadata->addEntry(ANDROID_CONTROL_AE_EXPOSURE_COMPENSATION, value32); - value = ANDROID_CONTROL_AE_LOCK_OFF; - resultMetadata->addEntry(ANDROID_CONTROL_AE_LOCK, value); - if (metadata.contains(controls::AeEnable)) { uint8_t aeMode = metadata.get(controls::AeEnable); resultMetadata->addEntry(ANDROID_CONTROL_AE_MODE, aeMode); } + if (metadata.contains(controls::AeLock)) { + uint8_t aeLock = metadata.get(controls::AeLock); + resultMetadata->addEntry(ANDROID_CONTROL_AE_LOCK, aeLock); + } + if (settings.getEntry(ANDROID_CONTROL_AE_TARGET_FPS_RANGE, &entry)) /* * \todo Retrieve the AE FPS range from the libcamera metadata.