From patchwork Fri Jul 2 10:37: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: 12774 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 462A3C3222 for ; Fri, 2 Jul 2021 10:38:32 +0000 (UTC) Received: from lancelot.ideasonboard.com (localhost [IPv6:::1]) by lancelot.ideasonboard.com (Postfix) with ESMTP id F35B2684F2; Fri, 2 Jul 2021 12:38:31 +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="o0nc2LLs"; 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 4F640684EA for ; Fri, 2 Jul 2021 12:38:30 +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 CCA6B4AB; Fri, 2 Jul 2021 12:38:28 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1625222310; bh=pea6CLApvUCw4iHgN4LrzPdMmrovxBTWZ3iURRQT+3k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=o0nc2LLsxb32/g4ajierppvbkDor0YgJOyXOdWBnP3tfyDkpvKlBUtFO9kNbq4HMW NaXq6+3jiG26H1zNRVMPUS2Hf/MLRJy38z86NMzGLb7CgrcrIBXCyfy+pcbpG/4BwV BSCdterBh0GL7l36+7G9xqcvRVarIEqHTJXSpmYE= From: Paul Elder To: libcamera-devel@lists.libcamera.org Date: Fri, 2 Jul 2021 19:37:53 +0900 Message-Id: <20210702103800.41291-10-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 09/16] android: Plumb AeLock 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 AeLock control into the HAL for CONTROL_AE_LOCK_AVAILABLE_MODES for static metadata. Bug: https://bugs.libcamera.org/show_bug.cgi?id=43 Signed-off-by: Paul Elder --- Changes in v3: - use new setMetadata - rebase on camera capabilities refactor TODO: plumb result metadata --- src/android/camera_capabilities.cpp | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/android/camera_capabilities.cpp b/src/android/camera_capabilities.cpp index 21ba791a..5896d61d 100644 --- a/src/android/camera_capabilities.cpp +++ b/src/android/camera_capabilities.cpp @@ -686,9 +686,17 @@ int CameraCapabilities::initializeStaticMetadata() staticMetadata_->addEntry(ANDROID_CONTROL_SCENE_MODE_OVERRIDES, sceneModesOverride); - uint8_t aeLockAvailable = ANDROID_CONTROL_AE_LOCK_AVAILABLE_FALSE; - staticMetadata_->addEntry(ANDROID_CONTROL_AE_LOCK_AVAILABLE, - aeLockAvailable); + uint8_t aeLockAvailable = setMetadata( + staticMetadata_.get(), + ANDROID_CONTROL_AE_LOCK_AVAILABLE, + controlsInfo, &controls::AeLock, + ControlRange::Max, + (uint8_t)ANDROID_CONTROL_AE_LOCK_AVAILABLE_FALSE); + if (aeLockAvailable != ANDROID_CONTROL_AE_LOCK_AVAILABLE_TRUE) { + LOG(HAL, Info) << "AE lock is unavailable"; + capabilities.erase(ANDROID_REQUEST_AVAILABLE_CAPABILITIES_BURST_CAPTURE); + capabilities.erase(ANDROID_REQUEST_AVAILABLE_CAPABILITIES_MANUAL_SENSOR); + } uint8_t awbLockAvailable = ANDROID_CONTROL_AWB_LOCK_AVAILABLE_FALSE; staticMetadata_->addEntry(ANDROID_CONTROL_AWB_LOCK_AVAILABLE,