{"id":13821,"url":"https://patchwork.libcamera.org/api/patches/13821/?format=json","web_url":"https://patchwork.libcamera.org/patch/13821/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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":"<20210913102007.2303225-3-paul.elder@ideasonboard.com>","date":"2021-09-13T10:20:07","name":"[libcamera-devel,3/3] android: Plumb noise reduction","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"c96da7b7220298fbe1f9378485d348e51619e8f1","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/people/17/?format=json","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"delegate":{"id":17,"url":"https://patchwork.libcamera.org/api/users/17/?format=json","username":"epaul","first_name":"Paul","last_name":"Elder","email":"paul.elder@ideasonboard.com"},"mbox":"https://patchwork.libcamera.org/patch/13821/mbox/","series":[{"id":2521,"url":"https://patchwork.libcamera.org/api/series/2521/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2521","date":"2021-09-13T10:20:05","name":"[libcamera-devel,1/3] controls: Promote NoiseReductionMode to non-draft","version":1,"mbox":"https://patchwork.libcamera.org/series/2521/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/13821/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/13821/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 77EE0BDC71\n\tfor ;\n\tMon, 13 Sep 2021 10:20:28 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 48AAF6918C;\n\tMon, 13 Sep 2021 12:20:28 +0200 (CEST)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id E0DE46024C\n\tfor ;\n\tMon, 13 Sep 2021 12:20:24 +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 6FA8D8F;\n\tMon, 13 Sep 2021 12:20:23 +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=\"VW3UC9sG\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1631528424;\n\tbh=ekiVG6jx0fuYugwInTqLlWTtNZjkMShcG+8YxQV1t9g=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=VW3UC9sG60swJvJo1uWAItXd82LNwLwIm1DZXIRxt/MxsTEFa3KOHOYLGHAAB6xou\n\tzFO5bH/G1bPOExw1JG3dalUHTIp647JMLML08RxZ0NAuscQqCYWluf7MRa1BA8qaeh\n\t8VCK2ZpdDnr8EEcLoCYWEDmIGx909R84tBVOCsq8=","From":"Paul Elder ","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 13 Sep 2021 19:20:07 +0900","Message-Id":"<20210913102007.2303225-3-paul.elder@ideasonboard.com>","X-Mailer":"git-send-email 2.27.0","In-Reply-To":"<20210913102007.2303225-1-paul.elder@ideasonboard.com>","References":"<20210913102007.2303225-1-paul.elder@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 3/3] android: Plumb noise reduction","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":"Add:\n- hardware level detection based on available noise reduction values\n (no sepcific capabilities seem to require it; only FULL in general)\n- Conversion from android to libcamera noise reduction modes for request\n (use switch-case instead of direct copy just in case)\n- Conversion from libcamera to android noise reduction modes for result\n\nWe already have the mechanism to report the available noise reduction\nmodes, so that is not added.\n\nSigned-off-by: Paul Elder \n---\n src/android/camera_capabilities.cpp | 19 +++++++++++++\n src/android/camera_device.cpp | 41 +++++++++++++++++++++++++++++\n 2 files changed, 60 insertions(+)","diff":"diff --git a/src/android/camera_capabilities.cpp b/src/android/camera_capabilities.cpp\nindex 08e44a1a..be6687d9 100644\n--- a/src/android/camera_capabilities.cpp\n+++ b/src/android/camera_capabilities.cpp\n@@ -375,6 +375,25 @@ void CameraCapabilities::computeHwLevel(\n \tif (!found || *entry.data.i32 != 0)\n \t\thwLevel = ANDROID_INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED;\n \n+\tfound = staticMetadata_->entryContains(\n+\t\tANDROID_NOISE_REDUCTION_AVAILABLE_NOISE_REDUCTION_MODES,\n+\t\tANDROID_NOISE_REDUCTION_MODE_OFF);\n+\tif (!found)\n+\t\thwLevel = ANDROID_INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED;\n+\n+\tfound = staticMetadata_->entryContains(\n+\t\tANDROID_NOISE_REDUCTION_AVAILABLE_NOISE_REDUCTION_MODES,\n+\t\tANDROID_NOISE_REDUCTION_MODE_FAST);\n+\tif (!found)\n+\t\thwLevel = ANDROID_INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED;\n+\n+\t/* Android docs don't say this is required, but CTS does. */\n+\tfound = staticMetadata_->entryContains(\n+\t\tANDROID_NOISE_REDUCTION_AVAILABLE_NOISE_REDUCTION_MODES,\n+\t\tANDROID_NOISE_REDUCTION_MODE_HIGH_QUALITY);\n+\tif (!found)\n+\t\thwLevel = ANDROID_INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED;\n+\n \thwLevel_ = hwLevel;\n }\n \ndiff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex ab31bdda..502dd10a 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -826,6 +826,40 @@ int CameraDevice::processControls(Camera3RequestDescriptor *descriptor)\n \t\tcontrols.set(controls::draft::TestPatternMode, testPatternMode);\n \t}\n \n+\tif (settings.getEntry(ANDROID_NOISE_REDUCTION_AVAILABLE_NOISE_REDUCTION_MODES, &entry)) {\n+\t\tconst uint8_t data = *entry.data.u8;\n+\t\tint32_t noiseReductionMode = controls::NoiseReductionModeOff;\n+\t\tswitch (data) {\n+\t\tcase ANDROID_NOISE_REDUCTION_MODE_OFF:\n+\t\t\tnoiseReductionMode = controls::NoiseReductionModeOff;\n+\t\t\tbreak;\n+\n+\t\tcase ANDROID_NOISE_REDUCTION_MODE_FAST:\n+\t\t\tnoiseReductionMode = controls::NoiseReductionModeFast;\n+\t\t\tbreak;\n+\n+\t\tcase ANDROID_NOISE_REDUCTION_MODE_HIGH_QUALITY:\n+\t\t\tnoiseReductionMode = controls::NoiseReductionModeHighQuality;\n+\t\t\tbreak;\n+\n+\t\tcase ANDROID_NOISE_REDUCTION_MODE_MINIMAL:\n+\t\t\tnoiseReductionMode = controls::NoiseReductionModeRaw;\n+\t\t\tbreak;\n+\n+\t\tcase ANDROID_NOISE_REDUCTION_MODE_ZERO_SHUTTER_LAG:\n+\t\t\tnoiseReductionMode = controls::NoiseReductionModeZSL;\n+\t\t\tbreak;\n+\n+\t\tdefault:\n+\t\t\tLOG(HAL, Error)\n+\t\t\t\t<< \"Unknown noise reduction mode: \" << data;\n+\n+\t\t\treturn -EINVAL;\n+\t\t}\n+\n+\t\tcontrols.set(controls::NoiseReductionMode, noiseReductionMode);\n+\t}\n+\n \treturn 0;\n }\n \n@@ -1379,6 +1413,13 @@ CameraDevice::getResultMetadata(const Camera3RequestDescriptor &descriptor) cons\n \t\tresultMetadata->addEntry(ANDROID_SCALER_CROP_REGION, cropRect);\n \t}\n \n+\tif (metadata.contains(controls::NoiseReductionMode)) {\n+\t\tconst int32_t noiseReductionMode =\n+\t\t\tmetadata.get(controls::NoiseReductionMode);\n+\t\tresultMetadata->addEntry(ANDROID_NOISE_REDUCTION_MODE,\n+\t\t\t\t\t noiseReductionMode);\n+\t}\n+\n \tif (metadata.contains(controls::draft::TestPatternMode)) {\n \t\tconst int32_t testPatternMode =\n \t\t\tmetadata.get(controls::draft::TestPatternMode);\n","prefixes":["libcamera-devel","3/3"]}