From patchwork Fri Jul 16 10:56:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Elder X-Patchwork-Id: 13022 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 A903BC3228 for ; Fri, 16 Jul 2021 10:57:24 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 4B8696853D; Fri, 16 Jul 2021 12:57:24 +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="MViCT9bK"; 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 E151668544 for ; Fri, 16 Jul 2021 12:57:21 +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 775573F0; Fri, 16 Jul 2021 12:57:20 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1626433041; bh=WvvORGQ1EFoBPhCi9lV/+1rSWrbsnCEZI8jdCqFkjak=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MViCT9bKpqRTTA+rAYJj7N4jq6+soeQuAl5ee8m8KhDwOKMOlhtp5faPT7alDO6D/ FEScWwZs97P5e3N8vtAKi8Br977Z4PjiJm96RoVK4CcSoWFB+OzP28J2S3j1QhJQMa wnjnRVXl0V/xHHFirNcSLzKuLxsJzbMAE362PkLU= From: Paul Elder To: libcamera-devel@lists.libcamera.org Date: Fri, 16 Jul 2021 19:56:26 +0900 Message-Id: <20210716105631.158153-17-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 16/21] android: Plumb AwbLock 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 AwbLock control into the HAL for CONTROL_AWB_LOCK_AVAILABLE_MODES for static metadata. Bug: https://bugs.libcamera.org/show_bug.cgi?id=45 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 | 9 +++++++-- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/android/camera_capabilities.cpp b/src/android/camera_capabilities.cpp index 85c39498..8ec4d014 100644 --- a/src/android/camera_capabilities.cpp +++ b/src/android/camera_capabilities.cpp @@ -937,9 +937,12 @@ int CameraCapabilities::initializeStaticMetadata() ControlRange::Max, ANDROID_CONTROL_AE_LOCK_AVAILABLE_FALSE); - uint8_t awbLockAvailable = ANDROID_CONTROL_AWB_LOCK_AVAILABLE_FALSE; - staticMetadata_->addEntry(ANDROID_CONTROL_AWB_LOCK_AVAILABLE, - awbLockAvailable); + setMetadata( + staticMetadata_.get(), + ANDROID_CONTROL_AWB_LOCK_AVAILABLE, + controlsInfo, &controls::AwbLock, + ControlRange::Max, + ANDROID_CONTROL_AWB_LOCK_AVAILABLE_FALSE); char availableControlModes = ANDROID_CONTROL_MODE_AUTO; staticMetadata_->addEntry(ANDROID_CONTROL_AVAILABLE_MODES, diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp index 8a9abd34..09ecbd59 100644 --- a/src/android/camera_device.cpp +++ b/src/android/camera_device.cpp @@ -790,6 +790,9 @@ int CameraDevice::processControls(Camera3RequestDescriptor *descriptor) if (settings.getEntry(ANDROID_CONTROL_AWB_MODE, &entry)) controls.set(controls::AwbMode, *entry.data.u8); + if (settings.getEntry(ANDROID_CONTROL_AWB_LOCK, &entry)) + controls.set(controls::AwbLock, *entry.data.u8); + return 0; } @@ -1252,8 +1255,10 @@ CameraDevice::getResultMetadata(const Camera3RequestDescriptor &descriptor) cons resultMetadata->addEntry(ANDROID_CONTROL_AWB_MODE, awbMode); } - value = ANDROID_CONTROL_AWB_LOCK_OFF; - resultMetadata->addEntry(ANDROID_CONTROL_AWB_LOCK, value); + if (metadata.contains(controls::AwbLock)) { + uint8_t awbLock = metadata.get(controls::AwbLock); + resultMetadata->addEntry(ANDROID_CONTROL_AWB_LOCK, awbLock); + } value = ANDROID_CONTROL_AWB_STATE_CONVERGED; resultMetadata->addEntry(ANDROID_CONTROL_AWB_STATE, value);