{"id":13021,"url":"https://patchwork.libcamera.org/api/1.1/patches/13021/?format=json","web_url":"https://patchwork.libcamera.org/patch/13021/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20210716105631.158153-16-paul.elder@ideasonboard.com>","date":"2021-07-16T10:56:25","name":"[libcamera-devel,RFC,v4,15/21] android: Plumb AwbMode control","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"3ef2b4361c0c92c7cc6a0145e303339345b33043","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/1.1/people/17/?format=json","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/13021/mbox/","series":[{"id":2244,"url":"https://patchwork.libcamera.org/api/1.1/series/2244/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2244","date":"2021-07-16T10:56:10","name":"Preliminary FULL plumbing","version":4,"mbox":"https://patchwork.libcamera.org/series/2244/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/13021/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/13021/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"parsemail@patchwork.libcamera.org","Delivered-To":"parsemail@patchwork.libcamera.org","Received":["from lancelot.ideasonboard.com (lancelot.ideasonboard.com\n\t[92.243.16.209])\n\tby patchwork.libcamera.org (Postfix) with ESMTPS id 83561C3228\n\tfor ;\n\tFri, 16 Jul 2021 10:57:22 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id DBAED68540;\n\tFri, 16 Jul 2021 12:57:21 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 00D7368521\n\tfor ;\n\tFri, 16 Jul 2021 12:57:20 +0200 (CEST)","from pyrite.rasen.tech (unknown\n\t[IPv6:2400:4051:61:600:2c71:1b79:d06d:5032])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 849183F0;\n\tFri, 16 Jul 2021 12:57:18 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"EkEbX1nH\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1626433039;\n\tbh=+GHPT2mjYPJ3pKY6rXnGwybodMlwEQ2ig6IHAk7EeYw=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=EkEbX1nHq/yz+wBnsZvF+aqfZDGqi1FutxpTQGKRMR+mMMDlcRxrs5M9V8ZU/Rc/v\n\tjg2ctLFOR6x2vPCDd2zXBDLDq/JmozABRFcM60RoGE9k/Kr95xkqtL58dpxyVlEVQK\n\tErnjkHlEGVRSjGkhZd3l0WnIVxbL0Zi9HLdslZnA=","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","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [RFC PATCH v4 15/21] android: Plumb AwbMode\n\tcontrol","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Plumb the AwbMode control into the HAL for\nCONTROL_AWB_AVAILABLE_MODES for static metadata.\n\nBug: https://bugs.libcamera.org/show_bug.cgi?id=44\nSigned-off-by: Paul Elder \n\nTODO: check templates\n\n---\nChanges in v4:\n- remove capability check\n- plumb into processControls\n\nChanges in v3:\n- use new setMetadata\n- rebase on camera capabilities refactor\n---\n src/android/camera_capabilities.cpp | 14 +++++---------\n src/android/camera_device.cpp | 9 +++++++--\n 2 files changed, 12 insertions(+), 11 deletions(-)","diff":"diff --git a/src/android/camera_capabilities.cpp b/src/android/camera_capabilities.cpp\nindex ac3d88b5..85c39498 100644\n--- a/src/android/camera_capabilities.cpp\n+++ b/src/android/camera_capabilities.cpp\n@@ -910,15 +910,11 @@ int CameraCapabilities::initializeStaticMetadata()\n \tstaticMetadata_->addEntry(ANDROID_CONTROL_AVAILABLE_VIDEO_STABILIZATION_MODES,\n \t\t\t\t availableStabilizationModes);\n \n-\t/*\n-\t * \\todo Inspect the camera capabilities to report the available\n-\t * AWB modes. Default to AUTO as CTS tests require it.\n-\t */\n-\tstd::vector availableAwbModes = {\n-\t\tANDROID_CONTROL_AWB_MODE_AUTO,\n-\t};\n-\tstaticMetadata_->addEntry(ANDROID_CONTROL_AWB_AVAILABLE_MODES,\n-\t\t\t\t availableAwbModes);\n+\tsetMetadata(\n+\t\tstaticMetadata_.get(),\n+\t\tANDROID_CONTROL_AWB_AVAILABLE_MODES,\n+\t\tcontrolsInfo, &controls::AwbMode,\n+\t\t{ ANDROID_CONTROL_AWB_MODE_AUTO });\n \n \tstd::vector availableMaxRegions = {\n \t\t0, 0, 0,\ndiff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 1721e0e8..8a9abd34 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -787,6 +787,9 @@ int CameraDevice::processControls(Camera3RequestDescriptor *descriptor)\n \tif (settings.getEntry(ANDROID_CONTROL_AE_LOCK, &entry))\n \t\tcontrols.set(controls::AeLock, *entry.data.u8);\n \n+\tif (settings.getEntry(ANDROID_CONTROL_AWB_MODE, &entry))\n+\t\tcontrols.set(controls::AwbMode, *entry.data.u8);\n+\n \treturn 0;\n }\n \n@@ -1244,8 +1247,10 @@ CameraDevice::getResultMetadata(const Camera3RequestDescriptor &descriptor) cons\n \tvalue = ANDROID_CONTROL_AF_TRIGGER_IDLE;\n \tresultMetadata->addEntry(ANDROID_CONTROL_AF_TRIGGER, value);\n \n-\tvalue = ANDROID_CONTROL_AWB_MODE_AUTO;\n-\tresultMetadata->addEntry(ANDROID_CONTROL_AWB_MODE, value);\n+\tif (metadata.contains(controls::AwbMode)) {\n+\t\tuint8_t awbMode = metadata.get(controls::AwbMode);\n+\t\tresultMetadata->addEntry(ANDROID_CONTROL_AWB_MODE, awbMode);\n+\t}\n \n \tvalue = ANDROID_CONTROL_AWB_LOCK_OFF;\n \tresultMetadata->addEntry(ANDROID_CONTROL_AWB_LOCK, value);\n","prefixes":["libcamera-devel","RFC","v4","15/21"]}