From patchwork Fri Jul 16 10:56:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Elder X-Patchwork-Id: 13021 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 83561C3228 for ; Fri, 16 Jul 2021 10:57:22 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id DBAED68540; Fri, 16 Jul 2021 12:57:21 +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="EkEbX1nH"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 00D7368521 for ; Fri, 16 Jul 2021 12:57:20 +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 849183F0; Fri, 16 Jul 2021 12:57:18 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1626433039; bh=+GHPT2mjYPJ3pKY6rXnGwybodMlwEQ2ig6IHAk7EeYw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EkEbX1nHq/yz+wBnsZvF+aqfZDGqi1FutxpTQGKRMR+mMMDlcRxrs5M9V8ZU/Rc/v jg2ctLFOR6x2vPCDd2zXBDLDq/JmozABRFcM60RoGE9k/Kr95xkqtL58dpxyVlEVQK ErnjkHlEGVRSjGkhZd3l0WnIVxbL0Zi9HLdslZnA= From: Paul Elder To: libcamera-devel@lists.libcamera.org Date: Fri, 16 Jul 2021 19:56:25 +0900 Message-Id: <20210716105631.158153-16-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 15/21] android: Plumb AwbMode 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 AwbMode control into the HAL for CONTROL_AWB_AVAILABLE_MODES for static metadata. Bug: https://bugs.libcamera.org/show_bug.cgi?id=44 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 | 14 +++++--------- src/android/camera_device.cpp | 9 +++++++-- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/android/camera_capabilities.cpp b/src/android/camera_capabilities.cpp index ac3d88b5..85c39498 100644 --- a/src/android/camera_capabilities.cpp +++ b/src/android/camera_capabilities.cpp @@ -910,15 +910,11 @@ int CameraCapabilities::initializeStaticMetadata() staticMetadata_->addEntry(ANDROID_CONTROL_AVAILABLE_VIDEO_STABILIZATION_MODES, availableStabilizationModes); - /* - * \todo Inspect the camera capabilities to report the available - * AWB modes. Default to AUTO as CTS tests require it. - */ - std::vector availableAwbModes = { - ANDROID_CONTROL_AWB_MODE_AUTO, - }; - staticMetadata_->addEntry(ANDROID_CONTROL_AWB_AVAILABLE_MODES, - availableAwbModes); + setMetadata( + staticMetadata_.get(), + ANDROID_CONTROL_AWB_AVAILABLE_MODES, + controlsInfo, &controls::AwbMode, + { ANDROID_CONTROL_AWB_MODE_AUTO }); std::vector availableMaxRegions = { 0, 0, 0, diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp index 1721e0e8..8a9abd34 100644 --- a/src/android/camera_device.cpp +++ b/src/android/camera_device.cpp @@ -787,6 +787,9 @@ int CameraDevice::processControls(Camera3RequestDescriptor *descriptor) if (settings.getEntry(ANDROID_CONTROL_AE_LOCK, &entry)) controls.set(controls::AeLock, *entry.data.u8); + if (settings.getEntry(ANDROID_CONTROL_AWB_MODE, &entry)) + controls.set(controls::AwbMode, *entry.data.u8); + return 0; } @@ -1244,8 +1247,10 @@ CameraDevice::getResultMetadata(const Camera3RequestDescriptor &descriptor) cons value = ANDROID_CONTROL_AF_TRIGGER_IDLE; resultMetadata->addEntry(ANDROID_CONTROL_AF_TRIGGER, value); - value = ANDROID_CONTROL_AWB_MODE_AUTO; - resultMetadata->addEntry(ANDROID_CONTROL_AWB_MODE, value); + if (metadata.contains(controls::AwbMode)) { + uint8_t awbMode = metadata.get(controls::AwbMode); + resultMetadata->addEntry(ANDROID_CONTROL_AWB_MODE, awbMode); + } value = ANDROID_CONTROL_AWB_LOCK_OFF; resultMetadata->addEntry(ANDROID_CONTROL_AWB_LOCK, value);