Patch Detail
Show a patch.
GET /api/1.1/patches/10391/?format=api
{ "id": 10391, "url": "https://patchwork.libcamera.org/api/1.1/patches/10391/?format=api", "web_url": "https://patchwork.libcamera.org/patch/10391/", "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": "<20201106154947.261132-5-jacopo@jmondi.org>", "date": "2020-11-06T15:49:47", "name": "[libcamera-devel,4/4] android: camera_device: Initialize pixel array properties", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "595d51770a7ddb21578a87de66b53c4a182ee508", "submitter": { "id": 3, "url": "https://patchwork.libcamera.org/api/1.1/people/3/?format=api", "name": "Jacopo Mondi", "email": "jacopo@jmondi.org" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/10391/mbox/", "series": [ { "id": 1449, "url": "https://patchwork.libcamera.org/api/1.1/series/1449/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=1449", "date": "2020-11-06T15:49:43", "name": "libcamera: Collect pixel array properties", "version": 1, "mbox": "https://patchwork.libcamera.org/series/1449/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/10391/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/10391/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 57B26BDB89\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 6 Nov 2020 15:49:57 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 34A7462D78;\n\tFri, 6 Nov 2020 16:49:57 +0100 (CET)", "from relay2-d.mail.gandi.net (relay2-d.mail.gandi.net\n\t[217.70.183.194])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 52203622AA\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 6 Nov 2020 16:49:54 +0100 (CET)", "from uno.lan (2-224-242-101.ip172.fastwebnet.it [2.224.242.101])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay2-d.mail.gandi.net (Postfix) with ESMTPSA id 18C9840007\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 6 Nov 2020 15:49:53 +0000 (UTC)" ], "X-Originating-IP": "2.224.242.101", "From": "Jacopo Mondi <jacopo@jmondi.org>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Fri, 6 Nov 2020 16:49:47 +0100", "Message-Id": "<20201106154947.261132-5-jacopo@jmondi.org>", "X-Mailer": "git-send-email 2.29.1", "In-Reply-To": "<20201106154947.261132-1-jacopo@jmondi.org>", "References": "<20201106154947.261132-1-jacopo@jmondi.org>", "MIME-Version": "1.0", "Subject": "[libcamera-devel] [PATCH 4/4] android: camera_device: Initialize\n\tpixel array properties", "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": "Initialize pixel array properties in the Android camera HAL\ninspecting the camera properties.\n\nIf the camera does not provide any suitable property, not static\nmetadata is registered to the Android framework.\n\nSigned-off-by: Jacopo Mondi <jacopo@jmondi.org>\n---\n src/android/camera_device.cpp | 38 +++++++++++++++++++++++++----------\n 1 file changed, 27 insertions(+), 11 deletions(-)", "diff": "diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 4690346e05cb..8a71d15be8ca 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -593,6 +593,7 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n \t}\n \n \tconst ControlInfoMap &controlsInfo = camera_->controls();\n+\tconst ControlList &properties = camera_->properties();\n \n \t/* Color correction static metadata. */\n \t{\n@@ -724,17 +725,32 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n \tstaticMetadata_->addEntry(ANDROID_JPEG_MAX_SIZE, &maxJpegBufferSize_, 1);\n \n \t/* Sensor static metadata. */\n-\tint32_t pixelArraySize[] = {\n-\t\t2592, 1944,\n-\t};\n-\tstaticMetadata_->addEntry(ANDROID_SENSOR_INFO_PIXEL_ARRAY_SIZE,\n-\t\t\t\t &pixelArraySize, 2);\n-\n-\tint32_t sensorSizes[] = {\n-\t\t0, 0, 2560, 1920,\n-\t};\n-\tstaticMetadata_->addEntry(ANDROID_SENSOR_INFO_ACTIVE_ARRAY_SIZE,\n-\t\t\t\t &sensorSizes, 4);\n+\t{\n+\t\tif (properties.contains(properties::PixelArraySize)) {\n+\t\t\tconst Size &size =\n+\t\t\t\tproperties.get<Size>(properties::PixelArraySize);\n+\t\t\tstd::vector<int32_t> data{\n+\t\t\t\tstatic_cast<int32_t>(size.width),\n+\t\t\t\tstatic_cast<int32_t>(size.height),\n+\t\t\t};\n+\t\t\tstaticMetadata_->addEntry(ANDROID_SENSOR_INFO_PIXEL_ARRAY_SIZE,\n+\t\t\t\t\t\t data.data(), data.size());\n+\t\t}\n+\t}\n+\t{\n+\t\tif (properties.contains(properties::PixelArrayActiveAreas)) {\n+\t\t\tconst Span<const Rectangle> &rects =\n+\t\t\t\tproperties.get<Span<const Rectangle>>(properties::PixelArrayActiveAreas);\n+\t\t\tstd::vector<int32_t> data{\n+\t\t\t\tstatic_cast<int32_t>(rects[0].x),\n+\t\t\t\tstatic_cast<int32_t>(rects[0].y),\n+\t\t\t\tstatic_cast<int32_t>(rects[0].width),\n+\t\t\t\tstatic_cast<int32_t>(rects[0].height),\n+\t\t\t};\n+\t\t\tstaticMetadata_->addEntry(ANDROID_SENSOR_INFO_ACTIVE_ARRAY_SIZE,\n+\t\t\t\t\t\t data.data(), data.size());\n+\t\t}\n+\t}\n \n \tint32_t sensitivityRange[] = {\n \t\t32, 2400,\n", "prefixes": [ "libcamera-devel", "4/4" ] }