Patch Detail
Show a patch.
GET /api/patches/10551/?format=api
{ "id": 10551, "url": "https://patchwork.libcamera.org/api/patches/10551/?format=api", "web_url": "https://patchwork.libcamera.org/patch/10551/", "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": "<20201202135354.264212-5-jacopo@jmondi.org>", "date": "2020-12-02T13:53:54", "name": "[libcamera-devel,v2,4/4] android: camera_device: Initialize pixel array properties", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "9d354a53cad73e72d02dd5b10378659e1599b16d", "submitter": { "id": 3, "url": "https://patchwork.libcamera.org/api/people/3/?format=api", "name": "Jacopo Mondi", "email": "jacopo@jmondi.org" }, "delegate": { "id": 15, "url": "https://patchwork.libcamera.org/api/users/15/?format=api", "username": "jmondi", "first_name": "Jacopo", "last_name": "Mondi", "email": "jacopo@jmondi.org" }, "mbox": "https://patchwork.libcamera.org/patch/10551/mbox/", "series": [ { "id": 1501, "url": "https://patchwork.libcamera.org/api/series/1501/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=1501", "date": "2020-12-02T13:53:50", "name": "libcamera: Collect pixel array properties", "version": 2, "mbox": "https://patchwork.libcamera.org/series/1501/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/10551/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/10551/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 02AA4BE178\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 2 Dec 2020 13:54:02 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id AFE51635A3;\n\tWed, 2 Dec 2020 14:54:01 +0100 (CET)", "from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net\n\t[217.70.183.200])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id CDF44635AB\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 2 Dec 2020 14:53:58 +0100 (CET)", "from uno.lan (93-34-118-233.ip49.fastwebnet.it [93.34.118.233])\n\t(Authenticated sender: jacopo@jmondi.org)\n\tby relay7-d.mail.gandi.net (Postfix) with ESMTPSA id 8610C2000E\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tWed, 2 Dec 2020 13:53:58 +0000 (UTC)" ], "X-Originating-IP": "93.34.118.233", "From": "Jacopo Mondi <jacopo@jmondi.org>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Wed, 2 Dec 2020 14:53:54 +0100", "Message-Id": "<20201202135354.264212-5-jacopo@jmondi.org>", "X-Mailer": "git-send-email 2.29.1", "In-Reply-To": "<20201202135354.264212-1-jacopo@jmondi.org>", "References": "<20201202135354.264212-1-jacopo@jmondi.org>", "MIME-Version": "1.0", "Subject": "[libcamera-devel] [PATCH v2 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\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\nSigned-off-by: Jacopo Mondi <jacopo@jmondi.org>\n---\n src/android/camera_device.cpp | 33 +++++++++++++++++++++++----------\n 1 file changed, 23 insertions(+), 10 deletions(-)", "diff": "diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 675af5705055..017a15cac284 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@@ -725,17 +726,29 @@ 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+\tif (properties.contains(properties::PixelArraySize)) {\n+\t\tconst Size &size =\n+\t\t\tproperties.get<Size>(properties::PixelArraySize);\n+\t\tstd::vector<int32_t> data{\n+\t\t\tstatic_cast<int32_t>(size.width),\n+\t\t\tstatic_cast<int32_t>(size.height),\n+\t\t};\n+\t\tstaticMetadata_->addEntry(ANDROID_SENSOR_INFO_PIXEL_ARRAY_SIZE,\n+\t\t\t\t\t data.data(), data.size());\n+\t}\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+\tif (properties.contains(properties::PixelArrayActiveAreas)) {\n+\t\tconst Span<const Rectangle> &rects =\n+\t\t\tproperties.get<Span<const Rectangle>>(properties::PixelArrayActiveAreas);\n+\t\tstd::vector<int32_t> data{\n+\t\t\tstatic_cast<int32_t>(rects[0].x),\n+\t\t\tstatic_cast<int32_t>(rects[0].y),\n+\t\t\tstatic_cast<int32_t>(rects[0].width),\n+\t\t\tstatic_cast<int32_t>(rects[0].height),\n+\t\t};\n+\t\tstaticMetadata_->addEntry(ANDROID_SENSOR_INFO_ACTIVE_ARRAY_SIZE,\n+\t\t\t\t\t data.data(), data.size());\n+\t}\n \n \tint32_t sensitivityRange[] = {\n \t\t32, 2400,\n", "prefixes": [ "libcamera-devel", "v2", "4/4" ] }