{"id":10873,"url":"https://patchwork.libcamera.org/api/patches/10873/?format=json","web_url":"https://patchwork.libcamera.org/patch/10873/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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":"<20210115170033.27124-11-jacopo@jmondi.org>","date":"2021-01-15T17:00:33","name":"[libcamera-devel,v7,10/10] android: camera_device: Do not default pixel array properties","commit_ref":"cda41ff754816cfcbe087e0f6f985f7b69c3fa0f","pull_url":null,"state":"accepted","archived":false,"hash":"a91a9e178210f85f579dae81c64e7eab18a59ebe","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/?format=json","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/10873/mbox/","series":[{"id":1578,"url":"https://patchwork.libcamera.org/api/series/1578/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1578","date":"2021-01-15T17:00:23","name":"libcamera: camera_sensor: Make validation more strict","version":7,"mbox":"https://patchwork.libcamera.org/series/1578/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/10873/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/10873/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 1F61FC3384\n\tfor ;\n\tFri, 15 Jan 2021 17:00:27 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id A7056680EF;\n\tFri, 15 Jan 2021 18:00:26 +0100 (CET)","from relay1-d.mail.gandi.net (relay1-d.mail.gandi.net\n\t[217.70.183.193])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id AD9FA680EE\n\tfor ;\n\tFri, 15 Jan 2021 18:00:21 +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 relay1-d.mail.gandi.net (Postfix) with ESMTPSA id 77EEC240014\n\tfor ;\n\tFri, 15 Jan 2021 17:00:21 +0000 (UTC)"],"X-Originating-IP":"93.34.118.233","From":"Jacopo Mondi ","To":"libcamera-devel@lists.libcamera.org","Date":"Fri, 15 Jan 2021 18:00:33 +0100","Message-Id":"<20210115170033.27124-11-jacopo@jmondi.org>","X-Mailer":"git-send-email 2.29.2","In-Reply-To":"<20210115170033.27124-1-jacopo@jmondi.org>","References":"<20210115170033.27124-1-jacopo@jmondi.org>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v7 10/10] 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":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Now that the pixel array properties have been defaulted in the\nCameraSensor class (or in the pipeline handler, for the UVC use case),\nthey will always be reported by the libcamera::Camera and there's no\nneed to default them in the Camera HAL.\n\nRemove defaults and assume properties are always there.\n\nReviewed-by: Niklas Söderlund \nReviewed-by: Laurent Pinchart \nSigned-off-by: Jacopo Mondi \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 23be2a593a2a..a136f8e33843 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 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 &rects =\n \t\t\tproperties.get(properties::PixelArrayActiveAreas);\n \t\tstd::vector 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","v7","10/10"]}