Patch Detail
Show a patch.
GET /api/patches/10791/?format=api
{ "id": 10791, "url": "https://patchwork.libcamera.org/api/patches/10791/?format=api", "web_url": "https://patchwork.libcamera.org/patch/10791/", "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": "<20201230230603.123486-7-jacopo@jmondi.org>", "date": "2020-12-30T23:06:03", "name": "[libcamera-devel,v4,6/6] android: camera_device: Do not default pixel array properties", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "a91a9e178210f85f579dae81c64e7eab18a59ebe", "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/10791/mbox/", "series": [ { "id": 1561, "url": "https://patchwork.libcamera.org/api/series/1561/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=1561", "date": "2020-12-30T23:05:57", "name": "libcamera: camera_sensor: Make validation more strict", "version": 4, "mbox": "https://patchwork.libcamera.org/series/1561/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/10791/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/10791/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 22D51C0F1A\n\tfor <parsemail@patchwork.libcamera.org>;\n\tWed, 30 Dec 2020 23:06:02 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id F176B619E2;\n\tThu, 31 Dec 2020 00:06:01 +0100 (CET)", "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 C92CC6031F\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 31 Dec 2020 00:05:56 +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 relay6-d.mail.gandi.net (Postfix) with ESMTPSA id 61D7CC0002;\n\tWed, 30 Dec 2020 23:05:56 +0000 (UTC)" ], "X-Originating-IP": "2.224.242.101", "From": "Jacopo Mondi <jacopo@jmondi.org>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Thu, 31 Dec 2020 00:06:03 +0100", "Message-Id": "<20201230230603.123486-7-jacopo@jmondi.org>", "X-Mailer": "git-send-email 2.29.2", "In-Reply-To": "<20201230230603.123486-1-jacopo@jmondi.org>", "References": "<20201230230603.123486-1-jacopo@jmondi.org>", "MIME-Version": "1.0", "Subject": "[libcamera-devel] [PATCH v4 6/6] android: camera_device: Do not\n\tdefault pixel 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": "Now that the pixel array properties have been defaulted in the\nCameraSensor class, they will always be reported by the\nlibcamera::Camera and there's no need to default them in the\nCamera HAL.\n\nRemove defaults and assume properties are always there.\n\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\nSigned-off-by: Jacopo Mondi <jacopo@jmondi.org>\n---\n src/android/camera_device.cpp | 20 ++------------------\n 1 file changed, 2 insertions(+), 18 deletions(-)", "diff": "diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\nindex 7678d4485ce9..9912875ea046 100644\n--- a/src/android/camera_device.cpp\n+++ b/src/android/camera_device.cpp\n@@ -851,7 +851,7 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\n \tstaticMetadata_->addEntry(ANDROID_JPEG_MAX_SIZE, &maxJpegBufferSize_, 1);\n \n \t/* Sensor static metadata. */\n-\tif (properties.contains(properties::PixelArraySize)) {\n+\t{\n \t\tconst Size &size =\n \t\t\tproperties.get(properties::PixelArraySize);\n \t\tstd::vector<int32_t> data{\n@@ -860,17 +860,9 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\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} else {\n-\t\t/*\n-\t\t * \\todo Drop the default once the ov5670 and ov13858 drivers\n-\t\t * are updated to report the pixel array size.\n-\t\t */\n-\t\tint32_t data[] = { 2592, 1944 };\n-\t\tstaticMetadata_->addEntry(ANDROID_SENSOR_INFO_PIXEL_ARRAY_SIZE,\n-\t\t\t\t\t data, 2);\n \t}\n \n-\tif (properties.contains(properties::PixelArrayActiveAreas)) {\n+\t{\n \t\tconst Span<const Rectangle> &rects =\n \t\t\tproperties.get(properties::PixelArrayActiveAreas);\n \t\tstd::vector<int32_t> data{\n@@ -881,14 +873,6 @@ const camera_metadata_t *CameraDevice::getStaticMetadata()\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} else {\n-\t\t/*\n-\t\t * \\todo Drop the default once the ov5670 and ov13858 drivers\n-\t\t * are updated to report the pixel array size.\n-\t\t */\n-\t\tint32_t data[] = { 0, 0, 2560, 1920 };\n-\t\tstaticMetadata_->addEntry(ANDROID_SENSOR_INFO_ACTIVE_ARRAY_SIZE,\n-\t\t\t\t\t data, 4);\n \t}\n \n \tint32_t sensitivityRange[] = {\n", "prefixes": [ "libcamera-devel", "v4", "6/6" ] }