From patchwork Tue Nov 23 10:40:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Elder X-Patchwork-Id: 14703 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 EA4F1BDB13 for ; Tue, 23 Nov 2021 10:41:15 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 995E7603B5; Tue, 23 Nov 2021 11:41:15 +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="Cdt7ow6x"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 783C76038B for ; Tue, 23 Nov 2021 11:41:12 +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 16224A1B; Tue, 23 Nov 2021 11:41:10 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1637664072; bh=GKCvOUTPtAJtH2PrVBIZzx00BdEkJ/HDjfxt+dPzseg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Cdt7ow6xffjXx2MWVQLbUoE+6HQu0w6ZrqZZII8arfu7bbJuHq0dVNt3dbHMUoTP7 tNTUyaj99DHfd/8EkGm2GNhNA+nEbhHWE2IMLZtIEm+amEvFf0rR9I4y5GB2BRV0oE 0qOsBtt9wdAmUfYRPVKowdO1e6tSSih/vEV4OO8I= From: Paul Elder To: libcamera-devel@lists.libcamera.org Date: Tue, 23 Nov 2021 19:40:42 +0900 Message-Id: <20211123104042.3100902-8-paul.elder@ideasonboard.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20211123104042.3100902-1-paul.elder@ideasonboard.com> References: <20211123104042.3100902-1-paul.elder@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH 7/7] android: Add CONTROL_MODE_OFF in template and static metadata 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" Add CONTROL_MODE_OFF to the available control modes in static metadata, if both AE off and AWB off are available. Also set CONTROL_MODE_OFF in the manual template. Signed-off-by: Paul Elder Reviewed-by: Kieran Bingham --- src/android/camera_capabilities.cpp | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/src/android/camera_capabilities.cpp b/src/android/camera_capabilities.cpp index f7397d27..5d90047b 100644 --- a/src/android/camera_capabilities.cpp +++ b/src/android/camera_capabilities.cpp @@ -999,7 +999,17 @@ int CameraCapabilities::initializeStaticMetadata() staticMetadata_->addEntry(ANDROID_CONTROL_AWB_LOCK_AVAILABLE, awbLockAvailable); - char availableControlModes = ANDROID_CONTROL_MODE_AUTO; + /* + * \todo Get this from some combination of the available AE and AWB + * modes + */ + std::vector availableControlModes = { ANDROID_CONTROL_MODE_AUTO }; + if (staticMetadata_->entryContains(ANDROID_CONTROL_AE_AVAILABLE_MODES, + ANDROID_CONTROL_AE_MODE_OFF) && + staticMetadata_->entryContains(ANDROID_CONTROL_AWB_AVAILABLE_MODES, + ANDROID_CONTROL_AWB_MODE_OFF)) { + availableControlModes.push_back(ANDROID_CONTROL_MODE_OFF); + } staticMetadata_->addEntry(ANDROID_CONTROL_AVAILABLE_MODES, availableControlModes); @@ -1467,6 +1477,12 @@ std::unique_ptr CameraCapabilities::requestTemplateManual() cons if (!manualTemplate) return nullptr; + if (staticMetadata_->entryContains(ANDROID_CONTROL_AVAILABLE_MODES, + ANDROID_CONTROL_MODE_OFF)) { + uint8_t mode = ANDROID_CONTROL_MODE_OFF; + manualTemplate->appendEntry(ANDROID_CONTROL_MODE, mode); + } + return manualTemplate; }