{"id":15200,"url":"https://patchwork.libcamera.org/api/patches/15200/?format=json","web_url":"https://patchwork.libcamera.org/patch/15200/","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":"<20211221052507.2678322-3-paul.elder@ideasonboard.com>","date":"2021-12-21T05:25:07","name":"[libcamera-devel,2/2] android: Plumb lens shading","commit_ref":null,"pull_url":null,"state":"not-applicable","archived":false,"hash":"303bbc9718f72f5858bd60516e48c6c0a7317bc4","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/15200/mbox/","series":[{"id":2855,"url":"https://patchwork.libcamera.org/api/series/2855/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=2855","date":"2021-12-21T05:25:05","name":"android: Lens shading","version":1,"mbox":"https://patchwork.libcamera.org/series/2855/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/15200/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/15200/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 BA806BF415\n\tfor ;\n\tTue, 21 Dec 2021 05:25:25 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 67C1460908;\n\tTue, 21 Dec 2021 06:25:25 +0100 (CET)","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 59D1E608E9\n\tfor ;\n\tTue, 21 Dec 2021 06:25:22 +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 8B44A881;\n\tTue, 21 Dec 2021 06:25:21 +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=\"ozn9cw+7\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1640064322;\n\tbh=yJW/wid7/A114WdKfol9TMMhMSZuLQYtpEGAkAYgpKA=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=ozn9cw+7TqGtpejOqx/dRNJK3V07n5puxrEjToIsNtHca+cb0gvmWkpdtq2FBlLtE\n\t9cxeMu8rgJWuRAYPV41Y5lHQMtQDFhXGcg0R14c84eZK0cxkQASiNeannkXy0Mj3pF\n\tWFWEIlqaE1kLQ16nZ+sQye9Ttcss1XGbqBPTZcLY=","From":"Paul Elder ","To":"libcamera-devel@lists.libcamera.org","Date":"Mon, 20 Dec 2021 23:25:07 -0600","Message-Id":"<20211221052507.2678322-3-paul.elder@ideasonboard.com>","X-Mailer":"git-send-email 2.27.0","In-Reply-To":"<20211221052507.2678322-1-paul.elder@ideasonboard.com>","References":"<20211221052507.2678322-1-paul.elder@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 2/2] android: Plumb lens shading","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 controls related to lens shading:\n- request the lens shading map to be reported (and report the current\n mode)\n- report the lens shading map (size + map)\n- request and report enabling/disabling of lens shading\n- corresponding static metadata to report available modes\n\nAlso add a check for the RAW capability, as being able to report the\nlens shading map is a requirement for it.\n\nSigned-off-by: Paul Elder \n---\n src/android/camera_capabilities.cpp | 102 +++++++++++++++++++++++++++-\n src/android/camera_device.cpp | 100 +++++++++++++++++++++++++--\n 2 files changed, 196 insertions(+), 6 deletions(-)","diff":"diff --git a/src/android/camera_capabilities.cpp b/src/android/camera_capabilities.cpp\nindex 742c6a6a..cb5ea5e9 100644\n--- a/src/android/camera_capabilities.cpp\n+++ b/src/android/camera_capabilities.cpp\n@@ -295,6 +295,18 @@ bool CameraCapabilities::validateManualPostProcessingCapability()\n \t\treturn false;\n \t}\n \n+\t/* From docs */\n+\tif (!staticMetadata_->entryContains(ANDROID_SHADING_AVAILABLE_MODES,\n+\t\t\t\t\t\t ANDROID_SHADING_MODE_OFF) ||\n+\t !staticMetadata_->entryContains(ANDROID_SHADING_AVAILABLE_MODES,\n+\t\t\t\t\t\t ANDROID_SHADING_MODE_FAST) ||\n+\t /* From CTS */\n+\t !staticMetadata_->entryContains(ANDROID_SHADING_AVAILABLE_MODES,\n+\t\t\t\t\t\t ANDROID_SHADING_MODE_HIGH_QUALITY)) {\n+\t\tLOG(HAL, Info) << noMode << \"missing shading modes off or fast or HQ\";\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_POST_PROCESSING\n@@ -375,8 +387,12 @@ CameraCapabilities::computeCapabilities()\n \tif (validateBurstCaptureCapability())\n \t\tcapabilities.insert(ANDROID_REQUEST_AVAILABLE_CAPABILITIES_BURST_CAPTURE);\n \n-\tif (rawStreamAvailable_)\n+\tif (rawStreamAvailable_ &&\n+\t staticMetadata_->entryContains(\n+\t\t ANDROID_STATISTICS_INFO_AVAILABLE_LENS_SHADING_MAP_MODES,\n+\t\t ANDROID_STATISTICS_LENS_SHADING_MAP_MODE_ON)) {\n \t\tcapabilities.insert(ANDROID_REQUEST_AVAILABLE_CAPABILITIES_RAW);\n+\t}\n \n \treturn capabilities;\n }\n@@ -437,6 +453,21 @@ void CameraCapabilities::computeHwLevel(\n \t\thwLevel = ANDROID_INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED;\n \t}\n \n+\t/*\n+\t * Shading mode and lens shading map mode are always available and\n+\t * don't need to be checked. We only need to check we support reporting\n+\t * the lens shading map.\n+\t *\n+\t * The lens shading map may have a null map with a zero size. It is\n+\t * valid, but will give android a null correction map.\n+\t * \\todo Confirm that this is fine\n+\t */\n+\tfound = availableResultKeys_.count(ANDROID_LENS_INFO_SHADING_MAP_SIZE);\n+\tif (!found) {\n+\t\tLOG(HAL, Info) << noFull << \"missing reportable lens shading map\";\n+\t\thwLevel = ANDROID_INFO_SUPPORTED_HARDWARE_LEVEL_LIMITED;\n+\t}\n+\n \thwLevel_ = hwLevel;\n }\n \n@@ -871,7 +902,9 @@ int CameraCapabilities::initializeStaticMetadata()\n \t\tANDROID_SENSOR_INFO_PIXEL_ARRAY_SIZE,\n \t\tANDROID_SENSOR_INFO_TIMESTAMP_SOURCE,\n \t\tANDROID_SENSOR_ORIENTATION,\n+\t\tANDROID_SHADING_AVAILABLE_MODES,\n \t\tANDROID_STATISTICS_INFO_AVAILABLE_FACE_DETECT_MODES,\n+\t\tANDROID_STATISTICS_INFO_AVAILABLE_LENS_SHADING_MAP_MODES,\n \t\tANDROID_STATISTICS_INFO_MAX_FACE_COUNT,\n \t\tANDROID_SYNC_MAX_LATENCY,\n \t};\n@@ -903,7 +936,9 @@ int CameraCapabilities::initializeStaticMetadata()\n \t\tANDROID_LENS_OPTICAL_STABILIZATION_MODE,\n \t\tANDROID_NOISE_REDUCTION_MODE,\n \t\tANDROID_SCALER_CROP_REGION,\n-\t\tANDROID_STATISTICS_FACE_DETECT_MODE\n+\t\tANDROID_SHADING_MODE,\n+\t\tANDROID_STATISTICS_FACE_DETECT_MODE,\n+\t\tANDROID_STATISTICS_LENS_SHADING_MAP_MODE,\n \t};\n \n \tavailableResultKeys_ = {\n@@ -949,6 +984,7 @@ int CameraCapabilities::initializeStaticMetadata()\n \t\tANDROID_SENSOR_ROLLING_SHUTTER_SKEW,\n \t\tANDROID_SENSOR_TEST_PATTERN_MODE,\n \t\tANDROID_SENSOR_TIMESTAMP,\n+\t\tANDROID_SHADING_MODE,\n \t\tANDROID_STATISTICS_FACE_DETECT_MODE,\n \t\tANDROID_STATISTICS_LENS_SHADING_MAP_MODE,\n \t\tANDROID_STATISTICS_HOT_PIXEL_MAP_MODE,\n@@ -1361,7 +1397,25 @@ int CameraCapabilities::initializeStaticMetadata()\n \tstaticMetadata_->addEntry(ANDROID_STATISTICS_INFO_MAX_FACE_COUNT,\n \t\t\t\t maxFaceCount);\n \n+\t/* Lens shading */\n \t{\n+\t\t/*\n+\t\t * Controls for requesting and reporting the lens shading map:\n+\t\t * static:\n+\t\t * - ANDROID_STATISTICS_INFO_AVAILABLE_LENS_SHADING_MAP_MODES\n+\t\t * - availability of requesting the lens shading map, always\n+\t\t * available\n+\t\t * request:\n+\t\t * - ANDROID_STATISTICS_LENS_SHADING_MAP_MODE\n+\t\t * - request reporting of the lens shading map, always available\n+\t\t * result:\n+\t\t * - ANDROID_STATISTICS_LENS_SHADING_MAP_MODE\n+\t\t * - result version of the above control\n+\t\t * - ANDROID_LENS_INFO_SHADING_MAP_SIZE\n+\t\t * - size of the lens shading map\n+\t\t * - ANDROID_STATISTICS_LENS_SHADING_MAP\n+\t\t * - the actual lens shading map\n+\t\t */\n \t\tstd::vector data;\n \t\tdata.reserve(2);\n \t\tconst auto &infoMap = controlsInfo.find(&controls::StatsLensShadingMapMode);\n@@ -1373,6 +1427,34 @@ int CameraCapabilities::initializeStaticMetadata()\n \t\t}\n \t\tstaticMetadata_->addEntry(ANDROID_STATISTICS_INFO_AVAILABLE_LENS_SHADING_MAP_MODES,\n \t\t\t\t\t data);\n+\n+\t\tconst auto &mapSizeInfoMap = controlsInfo.find(&controls::StatsLensShadingMapSize);\n+\t\tif (mapSizeInfoMap != controlsInfo.end())\n+\t\t\tavailableResultKeys_.insert(ANDROID_LENS_INFO_SHADING_MAP_SIZE);\n+\n+\t\tconst auto &mapInfoMap = controlsInfo.find(&controls::StatsLensShadingMap);\n+\t\tif (mapInfoMap != controlsInfo.end())\n+\t\t\tavailableResultKeys_.insert(ANDROID_STATISTICS_LENS_SHADING_MAP);\n+\n+\t\t/*\n+\t\t * Controls for enabling/disabling lens shading:\n+\t\t * static:\n+\t\t * - ANDROID_SHADING_AVAILABLE_MODES\n+\t\t * - list of available lens shading modes, always available\n+\t\t * request and result:\n+\t\t * - ANDROID_SHADING_MODE\n+\t\t * - set/report the shading mode (off, fast, hq)\n+\t\t */\n+\t\tdata.clear();\n+\t\tdata.reserve(3);\n+\t\tconst auto &shadingInfoMap = controlsInfo.find(&controls::LensShadingMode);\n+\t\tif (shadingInfoMap != controlsInfo.end()) {\n+\t\t\tfor (const auto &value : shadingInfoMap->second.values())\n+\t\t\t\tdata.push_back(value.get());\n+\t\t} else {\n+\t\t\tdata.push_back(ANDROID_SHADING_MODE_OFF);\n+\t\t}\n+\t\tstaticMetadata_->addEntry(ANDROID_SHADING_AVAILABLE_MODES, data);\n \t}\n \n \t/* Sync static metadata. */\n@@ -1802,6 +1884,16 @@ std::unique_ptr CameraCapabilities::requestTemplatePreview() con\n \trequestTemplate->addEntry(ANDROID_CONTROL_CAPTURE_INTENT,\n \t\t\t\t captureIntent);\n \n+\tuint8_t shadingMapMode = ANDROID_STATISTICS_LENS_SHADING_MAP_MODE_OFF;\n+\trequestTemplate->addEntry(ANDROID_STATISTICS_LENS_SHADING_MAP_MODE,\n+\t\t\t\t shadingMapMode);\n+\n+\tif (staticMetadata_->entryContains(ANDROID_SHADING_AVAILABLE_MODES,\n+\t\t\t\t\t\t ANDROID_SHADING_MODE_FAST)) {\n+\t\tuint8_t shadingMode = ANDROID_SHADING_MODE_FAST;\n+\t\trequestTemplate->addEntry(ANDROID_SHADING_MODE, shadingMode);\n+\t}\n+\n \treturn requestTemplate;\n }\n \n@@ -1817,6 +1909,12 @@ std::unique_ptr CameraCapabilities::requestTemplateStill() const\n \t\tstillTemplate->appendEntry(ANDROID_EDGE_MODE, edgeMode);\n \t}\n \n+\tif (staticMetadata_->entryContains(ANDROID_SHADING_AVAILABLE_MODES,\n+\t\t\t\t\t\t ANDROID_SHADING_MODE_HIGH_QUALITY)) {\n+\t\tuint8_t shadingMode = ANDROID_SHADING_MODE_HIGH_QUALITY;\n+\t\tstillTemplate->appendEntry(ANDROID_SHADING_MODE, shadingMode);\n+\t}\n+\n \tif (staticMetadata_->entryContains(\n \t\t\tANDROID_NOISE_REDUCTION_AVAILABLE_NOISE_REDUCTION_MODES,\n \t\t\tANDROID_NOISE_REDUCTION_MODE_HIGH_QUALITY)) {\ndiff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 883a5dc1..7be0ce45 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -973,6 +973,47 @@ int CameraDevice::processControls(Camera3RequestDescriptor *descriptor)\n \t\t}\n \t}\n \n+\tif (settings.getEntry(ANDROID_STATISTICS_LENS_SHADING_MAP_MODE, &entry)) {\n+\t\tconst int32_t data = static_cast(*entry.data.u8);\n+\t\tint32_t statsLensShadingMode;\n+\t\tswitch (data) {\n+\t\tcase ANDROID_STATISTICS_LENS_SHADING_MAP_MODE_ON:\n+\t\t\tstatsLensShadingMode = controls::StatsLensShadingMapModeOn;\n+\t\t\tbreak;\n+\t\tcase ANDROID_STATISTICS_LENS_SHADING_MAP_MODE_OFF:\n+\t\t\tstatsLensShadingMode = controls::StatsLensShadingMapModeOff;\n+\t\t\tbreak;\n+\t\tdefault:\n+\t\t\tLOG(HAL, Error)\n+\t\t\t\t<< \"Unknown lens shading map mode: \" << data;\n+\t\t\treturn -EINVAL;\n+\t\t}\n+\n+\t\tcontrols.set(controls::StatsLensShadingMapMode, statsLensShadingMode);\n+\t}\n+\n+\tif (settings.getEntry(ANDROID_SHADING_MODE, &entry)) {\n+\t\tconst int32_t data = static_cast(*entry.data.u8);\n+\t\tint32_t shadingMode;\n+\t\tswitch (data) {\n+\t\tcase ANDROID_SHADING_MODE_OFF:\n+\t\t\tshadingMode = controls::LensShadingModeOff;\n+\t\t\tbreak;\n+\t\tcase ANDROID_SHADING_MODE_FAST:\n+\t\t\tshadingMode = controls::LensShadingModeFast;\n+\t\t\tbreak;\n+\t\tcase ANDROID_SHADING_MODE_HIGH_QUALITY:\n+\t\t\tshadingMode = controls::LensShadingModeHighQuality;\n+\t\t\tbreak;\n+\t\tdefault:\n+\t\t\tLOG(HAL, Error)\n+\t\t\t\t<< \"Unknown shading mode: \" << data;\n+\t\t\treturn -EINVAL;\n+\t\t}\n+\n+\t\tcontrols.set(controls::LensShadingMode, shadingMode);\n+\t}\n+\n \treturn 0;\n }\n \n@@ -1613,10 +1654,6 @@ CameraDevice::getResultMetadata(const Camera3RequestDescriptor &descriptor) cons\n \tvalue = ANDROID_STATISTICS_FACE_DETECT_MODE_OFF;\n \tresultMetadata->addEntry(ANDROID_STATISTICS_FACE_DETECT_MODE, value);\n \n-\tvalue = ANDROID_STATISTICS_LENS_SHADING_MAP_MODE_OFF;\n-\tresultMetadata->addEntry(ANDROID_STATISTICS_LENS_SHADING_MAP_MODE,\n-\t\t\t\t value);\n-\n \tvalue = ANDROID_STATISTICS_HOT_PIXEL_MAP_MODE_OFF;\n \tresultMetadata->addEntry(ANDROID_STATISTICS_HOT_PIXEL_MAP_MODE, value);\n \n@@ -1720,6 +1757,61 @@ CameraDevice::getResultMetadata(const Camera3RequestDescriptor &descriptor) cons\n \tstd::vector focusRange = { 0.0f, 0.0f };\n \tresultMetadata->addEntry(ANDROID_LENS_FOCUS_RANGE, focusRange);\n \n+\tvalue = ANDROID_STATISTICS_LENS_SHADING_MAP_MODE_OFF;\n+\tif (metadata.contains(controls::StatsLensShadingMapMode)) {\n+\t\tswitch (metadata.get(controls::StatsLensShadingMapMode)) {\n+\t\tcase controls::StatsLensShadingMapModeOn:\n+\t\t\tvalue = ANDROID_STATISTICS_LENS_SHADING_MAP_MODE_ON;\n+\t\t\tbreak;\n+\t\tcase controls::StatsLensShadingMapModeOff:\n+\t\t\tvalue = ANDROID_STATISTICS_LENS_SHADING_MAP_MODE_OFF;\n+\t\t\tbreak;\n+\t\tdefault:\n+\t\t\tLOG(HAL, Error) << \"Invalid StatsLensShadingMapMode\";\n+\t\t}\n+\t}\n+\tresultMetadata->addEntry(ANDROID_STATISTICS_LENS_SHADING_MAP_MODE, value);\n+\n+\tif (metadata.contains(controls::LensShadingMode)) {\n+\t\tbool valid;\n+\t\tswitch (metadata.get(controls::LensShadingMode)) {\n+\t\tcase controls::LensShadingModeOff:\n+\t\t\tvalue = ANDROID_SHADING_MODE_OFF;\n+\t\t\tvalid = true;\n+\t\t\tbreak;\n+\t\tcase controls::LensShadingModeFast:\n+\t\t\tvalue = ANDROID_SHADING_MODE_FAST;\n+\t\t\tvalid = true;\n+\t\t\tbreak;\n+\t\tcase controls::LensShadingModeHighQuality:\n+\t\t\tvalue = ANDROID_SHADING_MODE_HIGH_QUALITY;\n+\t\t\tvalid = true;\n+\t\t\tbreak;\n+\t\tdefault:\n+\t\t\tLOG(HAL, Error) << \"Invalid LensShadingMode\";\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_SHADING_MODE, value);\n+\t}\n+\n+\tif (metadata.contains(controls::StatsLensShadingMapSize)) {\n+\t\tSize size = metadata.get(controls::StatsLensShadingMapSize);\n+\t\tstd::array mapSize = { size.width, size.height };\n+\t\tresultMetadata->addEntry(ANDROID_LENS_INFO_SHADING_MAP_SIZE, mapSize);\n+\n+\t\t/* valid size and null map is fine, but not vice versa */\n+\t\tif (metadata.contains(controls::StatsLensShadingMap)) {\n+\t\t\tconst Span map =\n+\t\t\t\tmetadata.get(controls::StatsLensShadingMap);\n+\t\t\tstd::vector shadingMap(map.begin(), map.end());\n+\t\t\tresultMetadata->addEntry(ANDROID_STATISTICS_LENS_SHADING_MAP,\n+\t\t\t\t\t\t shadingMap);\n+\t\t}\n+\t}\n+\n \t/*\n \t * Return the result metadata pack even is not valid: get() will return\n \t * nullptr.\n","prefixes":["libcamera-devel","2/2"]}