From patchwork Thu Jun 24 10:50:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Elder X-Patchwork-Id: 12699 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 5D1ADC321A for ; Thu, 24 Jun 2021 10:51:13 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id 1EE6A68EA1; Thu, 24 Jun 2021 12:51:13 +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="OXlA0uie"; dkim-atps=neutral Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 7E12D6893C for ; Thu, 24 Jun 2021 12:51:09 +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 DB0822C51; Thu, 24 Jun 2021 12:51:07 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1624531869; bh=7QYSs0V7onZo95wqhgLWnac4UNvDgbW9n5kMigWUo1c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OXlA0uie3rzyYc3kW0uZQ7pXA38jaCv8XE+tnfBR8JerL3wRlQ6/P+atOL7Nagj3Q hPFWfKQ+qKbBfnQzX8G2aoSsMLwba9hhqe7JnfNnXu/vIQ1aez2vMh278zt0BngmF2 7ArScMlDOCUzuQijV4E6SiH6N6FmZByZSJdN4xHE= From: Paul Elder To: libcamera-devel@lists.libcamera.org Date: Thu, 24 Jun 2021 19:50:53 +0900 Message-Id: <20210624105054.51700-3-paul.elder@ideasonboard.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210624105054.51700-1-paul.elder@ideasonboard.com> References: <20210624105054.51700-1-paul.elder@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [RFC PATCH v2 2/3] 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 --- Changes in v2: - use new setMetadata - rebase on camera capabilities refactor TODO: plumb result metadata --- src/android/camera_capabilities.cpp | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/android/camera_capabilities.cpp b/src/android/camera_capabilities.cpp index 7d795bf5..212d61d9 100644 --- a/src/android/camera_capabilities.cpp +++ b/src/android/camera_capabilities.cpp @@ -573,15 +573,16 @@ 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); + std::vector awbModes = + setMetadata(staticMetadata_.get(), ANDROID_CONTROL_AWB_AVAILABLE_MODES, + controlsInfo, &controls::AwbMode, + std::vector({ ANDROID_CONTROL_AWB_MODE_AUTO })); + if (std::find(awbModes.begin(), awbModes.end(), + ANDROID_CONTROL_AWB_MODE_OFF) == awbModes.end()) { + fullSupport = false; + /* \todo Double check if this is the correct capability */ + capabilities[ANDROID_REQUEST_AVAILABLE_CAPABILITIES_MANUAL_POST_PROCESSING] = false; + } std::vector availableMaxRegions = { 0, 0, 0,