Patch Detail
Show a patch.
GET /api/patches/10174/?format=api
{ "id": 10174, "url": "https://patchwork.libcamera.org/api/patches/10174/?format=api", "web_url": "https://patchwork.libcamera.org/patch/10174/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/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": "<20201021143635.22846-14-jacopo@jmondi.org>", "date": "2020-10-21T14:36:34", "name": "[libcamera-devel,v3,13/14] android: camera_device: Handle COLOR_CORRECTION_ABERRATION_MODE", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "3b69ee7749b8c961203057e89da37f2f1591abea", "submitter": { "id": 3, "url": "https://patchwork.libcamera.org/api/people/3/?format=api", "name": "Jacopo Mondi", "email": "jacopo@jmondi.org" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/10174/mbox/", "series": [ { "id": 1399, "url": "https://patchwork.libcamera.org/api/series/1399/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=1399", "date": "2020-10-21T14:36:21", "name": "libcamera: Introduce draft controls", "version": 3, "mbox": "https://patchwork.libcamera.org/series/1399/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/10174/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/10174/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 C60E3C3D3D\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 21 Oct 2020 14:36:56 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 2345561E5A;\n\tWed, 21 Oct 2020 16:36:56 +0200 (CEST)", "from relay6-d.mail.gandi.net (relay6-d.mail.gandi.net\n\t[217.70.183.198])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 01DA261E2A\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 21 Oct 2020 16:36:53 +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 relay6-d.mail.gandi.net (Postfix) with ESMTPSA id 5ECC1C0005;\n\tWed, 21 Oct 2020 14:36:52 +0000 (UTC)" ], "X-Originating-IP": "93.34.118.233", "From": "Jacopo Mondi <jacopo@jmondi.org>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Wed, 21 Oct 2020 16:36:34 +0200", "Message-Id": "<20201021143635.22846-14-jacopo@jmondi.org>", "X-Mailer": "git-send-email 2.28.0", "In-Reply-To": "<20201021143635.22846-1-jacopo@jmondi.org>", "References": "<20201021143635.22846-1-jacopo@jmondi.org>", "MIME-Version": "1.0", "Subject": "[libcamera-devel] [PATCH v3 13/14] android: camera_device: Handle\n\tCOLOR_CORRECTION_ABERRATION_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>", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "content": "Register the ANDROID_COLOR_CORRECTION_AVAILABLE_ABERRATION_MODES\nstatic metadata property inspecting the values retuned by the pipeline\nhandler.\n\nReserve in the static metadata pack enough space to support all the 3\navailable color correction aberration modes Android defines.\n\nReviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\nSigned-off-by: Jacopo Mondi <jacopo@jmondi.org>\n---\n src/android/camera_device.cpp | 20 +++++++++++++-------\n 1 file changed, 13 insertions(+), 7 deletions(-)", "diff": "diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex a4d9e6ddc519..af26ebce29bb 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -553,7 +553,7 @@ std::tuple<uint32_t, uint32_t> CameraDevice::calculateStaticMetadataSize()\n \t * Currently: 51 entries, 687 bytes of static metadata\n \t */\n \tuint32_t numEntries = 51;\n-\tuint32_t byteSize = 691;\n+\tuint32_t byteSize = 693;\n \n \t/*\n \t * Calculate space occupation in bytes for dynamically built metadata\n@@ -595,12 +595,18 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n \tconst ControlInfoMap &controlsInfo = camera_->controls();\n \n \t/* Color correction static metadata. */\n-\tstd::vector<uint8_t> aberrationModes = {\n-\t\tANDROID_COLOR_CORRECTION_ABERRATION_MODE_OFF,\n-\t};\n-\tstaticMetadata_->addEntry(ANDROID_COLOR_CORRECTION_AVAILABLE_ABERRATION_MODES,\n-\t\t\t\t aberrationModes.data(),\n-\t\t\t\t aberrationModes.size());\n+\t{\n+\t\tstd::vector<uint8_t> data(3);\n+\t\tconst auto &infoMap = controlsInfo.find(&controls::draft::ColorCorrectionAberrationMode);\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<int32_t>());\n+\t\t} else {\n+\t\t\tdata.push_back(ANDROID_COLOR_CORRECTION_ABERRATION_MODE_OFF);\n+\t\t}\n+\t\tstaticMetadata_->addEntry(ANDROID_COLOR_CORRECTION_AVAILABLE_ABERRATION_MODES,\n+\t\t\t\t\t data.data(), data.size());\n+\t}\n \n \t/* Control static metadata. */\n \tstd::vector<uint8_t> aeAvailableAntiBandingModes = {\n", "prefixes": [ "libcamera-devel", "v3", "13/14" ] }