From patchwork Fri Jul 2 10:37:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Elder X-Patchwork-Id: 12773 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 B6161C3223 for ; Fri, 2 Jul 2021 10:38:29 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 74A54684F2; Fri, 2 Jul 2021 12:38:29 +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="owPMM4w3"; 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 6C17E684EA for ; Fri, 2 Jul 2021 12:38:28 +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 013704AB; Fri, 2 Jul 2021 12:38:26 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1625222308; bh=iVTWY+Na5T9ScmcOGpzeaufCqnADUGvdg5sxTmjdXW0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=owPMM4w3qy1ck3nnokqawz86XvDOIR+Ej2gKkS3WqHGzsXmNNvtn+noKN/I857KwO 5pwX2lHGo61049GgSVgV4ZAVK/Y6aJOLg1YXMat33O6lijYvzcp5XnSL0ZfJ/j9QTH MDMMYmgigLAKAD8OnBETJdjSNnCWvsxfRmFUR7Ug= From: Paul Elder To: libcamera-devel@lists.libcamera.org Date: Fri, 2 Jul 2021 19:37:52 +0900 Message-Id: <20210702103800.41291-9-paul.elder@ideasonboard.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210702103800.41291-1-paul.elder@ideasonboard.com> References: <20210702103800.41291-1-paul.elder@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [RFC PATCH v3 08/16] android: Plumb AeEnable 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 AeEnable control into the HAL for CONTROL_AE_AVAILABLE_MODES for static metadata, and CONTROL_AE_MODE for result metadata. Bug: https://bugs.libcamera.org/show_bug.cgi?id=42 Signed-off-by: Paul Elder --- Changes in v3 - use new setMetadata - rebase on camera capabilities refactor --- src/android/camera_capabilities.cpp | 19 ++++++++++++++----- src/android/camera_device.cpp | 6 ++++-- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/src/android/camera_capabilities.cpp b/src/android/camera_capabilities.cpp index 530167de..21ba791a 100644 --- a/src/android/camera_capabilities.cpp +++ b/src/android/camera_capabilities.cpp @@ -7,6 +7,7 @@ #include "camera_capabilities.h" +#include #include #include #include @@ -561,11 +562,19 @@ int CameraCapabilities::initializeStaticMetadata() staticMetadata_->addEntry(ANDROID_CONTROL_AE_AVAILABLE_ANTIBANDING_MODES, aeAvailableAntiBandingModes); - std::vector aeAvailableModes = { - ANDROID_CONTROL_AE_MODE_ON, - }; - staticMetadata_->addEntry(ANDROID_CONTROL_AE_AVAILABLE_MODES, - aeAvailableModes); + std::vector aeModes = setMetadata( + staticMetadata_.get(), + ANDROID_CONTROL_AE_AVAILABLE_MODES, + controlsInfo, &controls::AeEnable, + std::vector({ ANDROID_CONTROL_AE_MODE_ON })); + + if (std::find(aeModes.begin(), aeModes.end(), + ANDROID_CONTROL_AE_MODE_OFF) == aeModes.end()) { + LOG(HAL, Info) << "AE cannot be turned off"; + hwLevels.erase(ANDROID_INFO_SUPPORTED_HARDWARE_LEVEL_FULL); + /* \todo Double check if this is the correct capability */ + capabilities.erase(ANDROID_REQUEST_AVAILABLE_CAPABILITIES_MANUAL_SENSOR); + } int64_t minFrameDurationNsec = -1; int64_t maxFrameDurationNsec = -1; diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp index 678cde23..1711f271 100644 --- a/src/android/camera_device.cpp +++ b/src/android/camera_device.cpp @@ -1202,8 +1202,10 @@ CameraDevice::getResultMetadata(const Camera3RequestDescriptor &descriptor) cons value = ANDROID_CONTROL_AE_LOCK_OFF; resultMetadata->addEntry(ANDROID_CONTROL_AE_LOCK, value); - value = ANDROID_CONTROL_AE_MODE_ON; - resultMetadata->addEntry(ANDROID_CONTROL_AE_MODE, value); + if (metadata.contains(controls::AeEnable)) { + uint8_t aeMode = metadata.get(controls::AeEnable); + resultMetadata->addEntry(ANDROID_CONTROL_AE_MODE, aeMode); + } if (settings.getEntry(ANDROID_CONTROL_AE_TARGET_FPS_RANGE, &entry)) /*