{"id":10231,"url":"https://patchwork.libcamera.org/api/1.1/patches/10231/?format=json","web_url":"https://patchwork.libcamera.org/patch/10231/","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":"<20201023171116.24899-13-jacopo@jmondi.org>","date":"2020-10-23T17:11:16","name":"[libcamera-devel,v4,12/12] android: camera_device: Handle LENS_SHADING_MAP_MODES","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"51cb41fba8eee298ef323a464dc62ffe9ae4a19a","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/1.1/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/10231/mbox/","series":[{"id":1410,"url":"https://patchwork.libcamera.org/api/1.1/series/1410/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1410","date":"2020-10-23T17:11:04","name":"libcamera: Introduce draft controls","version":4,"mbox":"https://patchwork.libcamera.org/series/1410/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/10231/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/10231/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 7ED11BDB13\n\tfor ;\n\tFri, 23 Oct 2020 17:11:36 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 4EC1F619C3;\n\tFri, 23 Oct 2020 19:11:36 +0200 (CEST)","from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net\n\t[217.70.183.197])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 51E69618A2\n\tfor ;\n\tFri, 23 Oct 2020 19:11:33 +0200 (CEST)","from uno.lan (93-34-118-233.ip49.fastwebnet.it [93.34.118.233])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay5-d.mail.gandi.net (Postfix) with ESMTPSA id 912381C0002;\n\tFri, 23 Oct 2020 17:11:32 +0000 (UTC)"],"X-Originating-IP":"93.34.118.233","From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 23 Oct 2020 19:11:16 +0200","Message-Id":"<20201023171116.24899-13-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.28.0","In-Reply-To":"<20201023171116.24899-1-jacopo@jmondi.org>","References":"<20201023171116.24899-1-jacopo@jmondi.org>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v4 12/12] android: camera_device: Handle\n\tLENS_SHADING_MAP_MODES","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","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Register the ANDROID_STATISTICS_INFO_AVAILABLE_LENS_SHADING_MAP_MODES\nstatic metadata property inspecting the values retuned by the pipeline\nhandler.\n\nAdd one entry and reserve in static metadata pack enough space to\nsupport all the 2 available lens shading map modes Android defines.\n\nReviewed-by: Laurent Pinchart \nReviewed-by: Kieran Bingham \nSigned-off-by: Jacopo Mondi \n---\n src/android/camera_device.cpp | 17 +++++++++++++++--\n 1 file changed, 15 insertions(+), 2 deletions(-)","diff":"diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex af26ebce29bb..9ec296939122 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -552,8 +552,8 @@ std::tuple CameraDevice::calculateStaticMetadataSize()\n \t * \\todo Keep this in sync with the actual number of entries.\n \t * Currently: 51 entries, 687 bytes of static metadata\n \t */\n-\tuint32_t numEntries = 51;\n-\tuint32_t byteSize = 693;\n+\tuint32_t numEntries = 52;\n+\tuint32_t byteSize = 694;\n \n \t/*\n \t * Calculate space occupation in bytes for dynamically built metadata\n@@ -781,6 +781,19 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n \tstaticMetadata_->addEntry(ANDROID_STATISTICS_INFO_MAX_FACE_COUNT,\n \t\t\t\t &maxFaceCount, 1);\n \n+\t{\n+\t\tstd::vector data(2);\n+\t\tconst auto &infoMap = controlsInfo.find(&controls::draft::LensShadingMapMode);\n+\t\tif (infoMap != controlsInfo.end()) {\n+\t\t\tfor (const auto &value : infoMap->second.values())\n+\t\t\t\tdata.push_back(value.get());\n+\t\t} else {\n+\t\t\tdata.push_back(ANDROID_STATISTICS_LENS_SHADING_MAP_MODE_OFF);\n+\t\t}\n+\t\tstaticMetadata_->addEntry(ANDROID_STATISTICS_INFO_AVAILABLE_LENS_SHADING_MAP_MODES,\n+\t\t\t\t\t data.data(), data.size());\n+\t}\n+\n \t/* Sync static metadata. */\n \tint32_t maxLatency = ANDROID_SYNC_MAX_LATENCY_UNKNOWN;\n \tstaticMetadata_->addEntry(ANDROID_SYNC_MAX_LATENCY, &maxLatency, 1);\n","prefixes":["libcamera-devel","v4","12/12"]}