Patch Detail
Show a patch.
GET /api/1.1/patches/15192/?format=api
{ "id": 15192, "url": "https://patchwork.libcamera.org/api/1.1/patches/15192/?format=api", "web_url": "https://patchwork.libcamera.org/patch/15192/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20211221051023.2628625-4-paul.elder@ideasonboard.com>", "date": "2021-12-21T05:10:23", "name": "[libcamera-devel,v2,3/3] android: Plumb noise reduction", "commit_ref": null, "pull_url": null, "state": "not-applicable", "archived": false, "hash": "22c7f6ea08b2bb9c4534b28fe9c844826512cf30", "submitter": { "id": 17, "url": "https://patchwork.libcamera.org/api/1.1/people/17/?format=api", "name": "Paul Elder", "email": "paul.elder@ideasonboard.com" }, "delegate": { "id": 17, "url": "https://patchwork.libcamera.org/api/1.1/users/17/?format=api", "username": "epaul", "first_name": "Paul", "last_name": "Elder", "email": "paul.elder@ideasonboard.com" }, "mbox": "https://patchwork.libcamera.org/patch/15192/mbox/", "series": [ { "id": 2852, "url": "https://patchwork.libcamera.org/api/1.1/series/2852/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=2852", "date": "2021-12-21T05:10:20", "name": "Noise reduction", "version": 2, "mbox": "https://patchwork.libcamera.org/series/2852/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/15192/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/15192/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "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 AB975BE080\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 21 Dec 2021 05:10:41 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 5EC4F608FB;\n\tTue, 21 Dec 2021 06:10:41 +0100 (CET)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id E19AC608A2\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 21 Dec 2021 06:10:37 +0100 (CET)", "from pyrite.mediacom.info (unknown\n\t[IPv6:2604:2d80:ad90:fb00:96fd:8874:873:6c16])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 1E128881;\n\tTue, 21 Dec 2021 06:10:36 +0100 (CET)" ], "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=\"EivcPtmn\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1640063437;\n\tbh=LDxye+Yt2azrg2N2mD2kFUpmtKkA2N67mtnHeY03Bxw=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=EivcPtmntobPhOxeyngTyGsOo+/OZNO6X2p2/1niS/AH0fqDXRxCbxOytTXPVTW3q\n\t6bILokoEH7V0VxxTcP2FoYxjPxCysSdo+GxiIS2iP3rSn8sMlTJb4IUO6+8NK7MRfH\n\tbL1FMQb+avfVOPsgt38bjEuO7c9ItfaqYxwqbjL4=", "From": "Paul Elder <paul.elder@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Mon, 20 Dec 2021 23:10:23 -0600", "Message-Id": "<20211221051023.2628625-4-paul.elder@ideasonboard.com>", "X-Mailer": "git-send-email 2.27.0", "In-Reply-To": "<20211221051023.2628625-1-paul.elder@ideasonboard.com>", "References": "<20211221051023.2628625-1-paul.elder@ideasonboard.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v2 3/3] android: Plumb noise reduction", "X-BeenThere": "libcamera-devel@lists.libcamera.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Add:\n- hardware level detection based on available noise reduction values\n (no specific 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- noise reduction values to the templates\n\nWe already have the mechanism to report the available noise reduction\nmodes, so that is not added.\n\nSigned-off-by: Paul Elder <paul.elder@ideasonboard.com>\n\n---\nChanges in v2:\n- change result metadata generation to switch-case\n---\n src/android/camera_capabilities.cpp | 34 +++++++++++++-\n src/android/camera_device.cpp | 70 +++++++++++++++++++++++++++--\n 2 files changed, 100 insertions(+), 4 deletions(-)", "diff": "diff --git a/src/android/camera_capabilities.cpp b/src/android/camera_capabilities.cpp\nindex d6a1589e..365937ed 100644\n--- a/src/android/camera_capabilities.cpp\n+++ b/src/android/camera_capabilities.cpp\n@@ -412,6 +412,31 @@ void CameraCapabilities::computeHwLevel(\n \t\thwLevel = ANDROID_INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED;\n \t}\n \n+\tfound = staticMetadata_->entryContains<uint8_t>(\n+\t\tANDROID_NOISE_REDUCTION_AVAILABLE_NOISE_REDUCTION_MODES,\n+\t\tANDROID_NOISE_REDUCTION_MODE_OFF);\n+\tif (!found) {\n+\t\tLOG(HAL, Info) << noFull << \"missing noise reduction mode off\";\n+\t\thwLevel = ANDROID_INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED;\n+\t}\n+\n+\tfound = staticMetadata_->entryContains<uint8_t>(\n+\t\tANDROID_NOISE_REDUCTION_AVAILABLE_NOISE_REDUCTION_MODES,\n+\t\tANDROID_NOISE_REDUCTION_MODE_FAST);\n+\tif (!found) {\n+\t\tLOG(HAL, Info) << noFull << \"missing noise reduction mode fast\";\n+\t\thwLevel = ANDROID_INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED;\n+\t}\n+\n+\t/* Android docs don't say this is required, but CTS does. */\n+\tfound = staticMetadata_->entryContains<uint8_t>(\n+\t\tANDROID_NOISE_REDUCTION_AVAILABLE_NOISE_REDUCTION_MODES,\n+\t\tANDROID_NOISE_REDUCTION_MODE_HIGH_QUALITY);\n+\tif (!found) {\n+\t\tLOG(HAL, Info) << noFull << \"missing noise reduction mode high quality\";\n+\t\thwLevel = ANDROID_INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED;\n+\t}\n+\n \thwLevel_ = hwLevel;\n }\n \n@@ -1727,7 +1752,7 @@ std::unique_ptr<CameraMetadata> CameraCapabilities::requestTemplatePreview() con\n \trequestTemplate->addEntry(ANDROID_STATISTICS_FACE_DETECT_MODE,\n \t\t\t\t faceDetectMode);\n \n-\tuint8_t noiseReduction = ANDROID_NOISE_REDUCTION_MODE_OFF;\n+\tuint8_t noiseReduction = ANDROID_NOISE_REDUCTION_MODE_FAST;\n \trequestTemplate->addEntry(ANDROID_NOISE_REDUCTION_MODE,\n \t\t\t\t noiseReduction);\n \n@@ -1764,6 +1789,13 @@ std::unique_ptr<CameraMetadata> CameraCapabilities::requestTemplateStill() const\n \t\tstillTemplate->appendEntry(ANDROID_EDGE_MODE, edgeMode);\n \t}\n \n+\tif (staticMetadata_->entryContains<uint8_t>(\n+\t\t\tANDROID_NOISE_REDUCTION_AVAILABLE_NOISE_REDUCTION_MODES,\n+\t\t\tANDROID_NOISE_REDUCTION_MODE_HIGH_QUALITY)) {\n+\t\tuint8_t noiseReduction = ANDROID_NOISE_REDUCTION_MODE_HIGH_QUALITY;\n+\t\tstillTemplate->appendEntry(ANDROID_NOISE_REDUCTION_MODE, noiseReduction);\n+\t}\n+\n \treturn stillTemplate;\n }\n \ndiff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 8861447d..e521ae0a 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -920,6 +920,39 @@ int CameraDevice::processControls(Camera3RequestDescriptor *descriptor)\n \t\t\tcontrols.set(controls::DigitalGain, lastDigitalGain_);\n \t}\n \n+\tif (settings.getEntry(ANDROID_NOISE_REDUCTION_MODE, &entry)) {\n+\t\tconst uint8_t data = *entry.data.u8;\n+\t\tint32_t noiseReductionMode;\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+\t\t\treturn -EINVAL;\n+\t\t}\n+\n+\t\tcontrols.set(controls::NoiseReductionMode, noiseReductionMode);\n+\t}\n+\n \tif (settings.getEntry(ANDROID_EDGE_MODE, &entry)) {\n \t\tconst auto &info = camera_->controls().find(&controls::Sharpness);\n \t\tif (info != camera_->controls().end()) {\n@@ -1587,9 +1620,6 @@ CameraDevice::getResultMetadata(const Camera3RequestDescriptor &descriptor) cons\n \tvalue = ANDROID_STATISTICS_SCENE_FLICKER_NONE;\n \tresultMetadata->addEntry(ANDROID_STATISTICS_SCENE_FLICKER, value);\n \n-\tvalue = ANDROID_NOISE_REDUCTION_MODE_OFF;\n-\tresultMetadata->addEntry(ANDROID_NOISE_REDUCTION_MODE, value);\n-\n \t/* 33.3 msec */\n \tconst int64_t rolling_shutter_skew = 33300000;\n \tresultMetadata->addEntry(ANDROID_SENSOR_ROLLING_SHUTTER_SKEW,\n@@ -1643,6 +1673,40 @@ 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\tbool valid;\n+\t\tswitch (metadata.get(controls::NoiseReductionMode)) {\n+\t\tcase controls::NoiseReductionModeOff:\n+\t\t\tvalue = ANDROID_NOISE_REDUCTION_MODE_OFF;\n+\t\t\tvalid = true;\n+\t\t\tbreak;\n+\t\tcase controls::NoiseReductionModeFast:\n+\t\t\tvalue = ANDROID_NOISE_REDUCTION_MODE_FAST;\n+\t\t\tvalid = true;\n+\t\t\tbreak;\n+\t\tcase controls::NoiseReductionModeHighQuality:\n+\t\t\tvalue = ANDROID_NOISE_REDUCTION_MODE_HIGH_QUALITY;\n+\t\t\tvalid = true;\n+\t\t\tbreak;\n+\t\tcase controls::NoiseReductionModeRaw:\n+\t\t\tvalue = ANDROID_NOISE_REDUCTION_MODE_MINIMAL;\n+\t\t\tvalid = true;\n+\t\t\tbreak;\n+\t\tcase controls::NoiseReductionModeZSL:\n+\t\t\tvalue = ANDROID_NOISE_REDUCTION_MODE_ZERO_SHUTTER_LAG;\n+\t\t\tvalid = true;\n+\t\t\tbreak;\n+\t\tdefault:\n+\t\t\tLOG(HAL, Error)\n+\t\t\t\t<< \"Unknown noise reduction mode\";\n+\t\t\tvalid = false;\n+\t\t}\n+\n+\t\t/* Can be null on non-FULL */\n+\t\tif (valid)\n+\t\t\tresultMetadata->addEntry(ANDROID_NOISE_REDUCTION_MODE, value);\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", "v2", "3/3" ] }