Patch Detail
Show a patch.
GET /api/1.1/patches/13428/?format=api
{ "id": 13428, "url": "https://patchwork.libcamera.org/api/1.1/patches/13428/?format=api", "web_url": "https://patchwork.libcamera.org/patch/13428/", "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": "<20210823094806.1434280-1-paul.elder@ideasonboard.com>", "date": "2021-08-23T09:48:05", "name": "[libcamera-devel,RFC,1/2] android: Plumb Sharpness control into EDGE_MODE", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "4f07bc8e71494f2280b57ebb995366b892addca3", "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/13428/mbox/", "series": [ { "id": 2382, "url": "https://patchwork.libcamera.org/api/1.1/series/2382/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=2382", "date": "2021-08-23T09:48:05", "name": "[libcamera-devel,RFC,1/2] android: Plumb Sharpness control into EDGE_MODE", "version": 1, "mbox": "https://patchwork.libcamera.org/series/2382/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/13428/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/13428/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 CEDB0BD87C\n\tfor <parsemail@patchwork.libcamera.org>;\n\tMon, 23 Aug 2021 09:48:28 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 43B3E68892;\n\tMon, 23 Aug 2021 11:48:28 +0200 (CEST)", "from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id CFAC368891\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 23 Aug 2021 11:48:26 +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 6D3A12A5;\n\tMon, 23 Aug 2021 11:48:25 +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=\"kuv+WlJb\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1629712106;\n\tbh=T1aDOoZV/8oWJxhhuIl8juyH8+ijvz9Zbyw6QB7UN+4=;\n\th=From:To:Cc:Subject:Date:From;\n\tb=kuv+WlJbalmdoX/MTxqGptszJ11C6cViYzVha+Z5GcgPC8It0nVseftZjJqtPC4aT\n\tBDbT9NFttrlaBaI9fP+Z0X2Bu36ZV/mqjyWQhwghjy5h9s5lYDZHX+D5DVhuwNgd97\n\tK6X2Kb1O9YokcQJ1ORuSjc+hBvVhuCuuycwXd3zs=", "From": "Paul Elder <paul.elder@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Mon, 23 Aug 2021 18:48:05 +0900", "Message-Id": "<20210823094806.1434280-1-paul.elder@ideasonboard.com>", "X-Mailer": "git-send-email 2.27.0", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [RFC PATCH 1/2] android: Plumb Sharpness control\n\tinto EDGE_MODE", "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": "Plumb the Sharpness control into the HAL for EDGE_MODE and other related\nandroid controls.\n\nBug: https://bugs.libcamera.org/show_bug.cgi?id=46\nSigned-off-by: Paul Elder <paul.elder@ideasonboard.com>\n---\n src/android/camera_capabilities.cpp | 33 ++++++++++++++++++++++\n src/android/camera_device.cpp | 44 +++++++++++++++++++++++++++++\n 2 files changed, 77 insertions(+)", "diff": "diff --git a/src/android/camera_capabilities.cpp b/src/android/camera_capabilities.cpp\nindex bd661675..d12dc048 100644\n--- a/src/android/camera_capabilities.cpp\n+++ b/src/android/camera_capabilities.cpp\n@@ -231,6 +231,11 @@ bool CameraCapabilities::validateManualSensorCapability()\n \t\treturn false;\n \t}\n \n+\tif (!staticMetadata_->hasEntry(ANDROID_EDGE_AVAILABLE_EDGE_MODES)) {\n+\t\tLOG(HAL, Info) << noMode << \"missing edge modes\";\n+\t\treturn false;\n+\t}\n+\n \t/*\n \t * \\todo Return true here after we satisfy all the requirements:\n \t * https://developer.android.com/reference/android/hardware/camera2/CameraMetadata#REQUEST_AVAILABLE_CAPABILITIES_MANUAL_SENSOR\n@@ -938,6 +943,22 @@ int CameraCapabilities::initializeStaticMetadata()\n \tstaticMetadata_->addEntry(ANDROID_CONTROL_AVAILABLE_MODES,\n \t\t\t\t availableControlModes);\n \n+\n+\tconst auto &edgeInfo = controlsInfo.find(&controls::Sharpness);\n+\tif (edgeInfo != controlsInfo.end()) {\n+\t\tstd::vector<uint8_t> availableEdgeModes = {\n+\t\t\tANDROID_EDGE_MODE_OFF,\n+\t\t\tANDROID_EDGE_MODE_FAST,\n+\t\t\tANDROID_EDGE_MODE_HIGH_QUALITY,\n+\t\t};\n+\n+\t\tstaticMetadata_->addEntry(ANDROID_EDGE_AVAILABLE_EDGE_MODES,\n+\t\t\t\t\t availableEdgeModes);\n+\t\tavailableCharacteristicsKeys_.insert(ANDROID_EDGE_AVAILABLE_EDGE_MODES);\n+\t\tavailableRequestKeys_.insert(ANDROID_EDGE_MODE);\n+\t\tavailableResultKeys_.insert(ANDROID_EDGE_MODE);\n+\t}\n+\n \t/* JPEG static metadata. */\n \n \t/*\n@@ -1330,6 +1351,9 @@ std::unique_ptr<CameraMetadata> CameraCapabilities::requestTemplateManual() cons\n \tif (!manualTemplate)\n \t\treturn nullptr;\n \n+\tif (availableRequestKeys_.count(ANDROID_EDGE_MODE))\n+\t\tmanualTemplate->addEntry(ANDROID_EDGE_MODE, ANDROID_EDGE_MODE_OFF);\n+\n \treturn manualTemplate;\n }\n \n@@ -1390,6 +1414,9 @@ std::unique_ptr<CameraMetadata> CameraCapabilities::requestTemplatePreview() con\n \tuint8_t awbLock = ANDROID_CONTROL_AWB_LOCK_OFF;\n \trequestTemplate->addEntry(ANDROID_CONTROL_AWB_LOCK, awbLock);\n \n+\tif (availableRequestKeys_.count(ANDROID_EDGE_MODE))\n+\t\trequestTemplate->addEntry(ANDROID_EDGE_MODE, ANDROID_EDGE_MODE_FAST);\n+\n \tuint8_t flashMode = ANDROID_FLASH_MODE_OFF;\n \trequestTemplate->addEntry(ANDROID_FLASH_MODE, flashMode);\n \n@@ -1428,6 +1455,9 @@ std::unique_ptr<CameraMetadata> CameraCapabilities::requestTemplateStill() const\n \tif (!stillTemplate)\n \t\treturn nullptr;\n \n+\tif (availableRequestKeys_.count(ANDROID_EDGE_MODE))\n+\t\tstillTemplate->addEntry(ANDROID_EDGE_MODE, ANDROID_EDGE_MODE_HIGH_QUALITY);\n+\n \treturn stillTemplate;\n }\n \n@@ -1445,6 +1475,9 @@ std::unique_ptr<CameraMetadata> CameraCapabilities::requestTemplateVideo() const\n \tstaticMetadata_->getEntry(ANDROID_CONTROL_AE_AVAILABLE_TARGET_FPS_RANGES,\n \t\t\t\t &entry);\n \n+\tif (availableRequestKeys_.count(ANDROID_EDGE_MODE))\n+\t\tpreviewTemplate->addEntry(ANDROID_EDGE_MODE, ANDROID_EDGE_MODE_FAST);\n+\n \t/*\n \t * Assume the AE_AVAILABLE_TARGET_FPS_RANGE static metadata\n \t * has been assembled as {{min, max} {max, max}}.\ndiff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex a69b687a..96afec81 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -829,6 +829,24 @@ int CameraDevice::processControls(Camera3RequestDescriptor *descriptor)\n \t\tcontrols.set(controls::draft::TestPatternMode, testPatternMode);\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+\t\t\tfloat min = info->second.min().get<float>();\n+\t\t\tfloat def = info->second.def().get<float>();\n+\t\t\tfloat max = info->second.max().get<float>();\n+\t\t\t/*\n+\t\t\t * The default value might be unusable since control\n+\t\t\t * serialization ignores it. Alternatively the default\n+\t\t\t * could be simply set to zero or the minimum value.\n+\t\t\t * Use the maximum sharpness value in these cases.\n+\t\t\t */\n+\t\t\tfloat val = (def == 0.0f || def == min) ? max : def;\n+\t\t\tcontrols.set(controls::Sharpness,\n+\t\t\t\t *entry.data.u8 == ANDROID_EDGE_MODE_OFF ? min : val);\n+\t\t}\n+\t}\n+\n \treturn 0;\n }\n \n@@ -1371,6 +1389,32 @@ CameraDevice::getResultMetadata(const Camera3RequestDescriptor &descriptor) cons\n \t\t\t\t\t duration);\n \t}\n \n+\tif (metadata.contains(controls::Sharpness) &&\n+\t settings.getEntry(ANDROID_EDGE_MODE, &entry)) {\n+\t\tconst auto &info = camera_->controls().find(&controls::Sharpness);\n+\t\tif (info != camera_->controls().end()) {\n+\t\t\tfloat min = info->second.min().get<float>();\n+\t\t\tfloat max = info->second.max().get<float>();\n+\t\t\tfloat sharpness = metadata.get(controls::Sharpness);\n+\t\t\t/*\n+\t\t\t * 1% of the sharpening value range is considered \"no\n+\t\t\t * sharpening\".\n+\t\t\t */\n+\t\t\tbool closeToMin = (sharpness - min) < (min + (0.01 * (max - min))) ||\n+\t\t\t\t\t min == max;\n+\n+\t\t\t/*\n+\t\t\t * libcamera doesn't distinguish between fast vs HQ\n+\t\t\t * sharpening modes. Report the mode that was\n+\t\t\t * requested.\n+\t\t\t */\n+\t\t\tresultMetadata->addEntry(ANDROID_EDGE_MODE,\n+\t\t\t\t\t\t closeToMin ?\n+\t\t\t\t\t\t (uint8_t)ANDROID_EDGE_MODE_OFF :\n+\t\t\t\t\t\t *entry.data.u8);\n+\t\t}\n+\t}\n+\n \tif (metadata.contains(controls::ScalerCrop)) {\n \t\tRectangle crop = metadata.get(controls::ScalerCrop);\n \t\tint32_t cropRect[] = {\n", "prefixes": [ "libcamera-devel", "RFC", "1/2" ] }