[{"id":14542,"web_url":"https://patchwork.libcamera.org/comment/14542/","msgid":"","date":"2021-01-13T13:04:31","subject":"Re: [libcamera-devel] [PATCH v6 10/10] android: camera_device: Do\n\tnot default pixel array properties","submitter":{"id":5,"url":"https://patchwork.libcamera.org/api/people/5/","name":"Niklas Söderlund","email":"niklas.soderlund@ragnatech.se"},"content":"Hi Jacopo,\n\nOn 2021-01-07 10:47:35 +0100, Jacopo Mondi wrote:\n> Now that the pixel array properties have been defaulted in the\n> CameraSensor class (or in the pipeline handler, for the UVC use case),\n> they will always be reported by the libcamera::Camera and there's no\n> need to default them in the Camera HAL.\n> \n> Remove defaults and assume properties are always there.\n> \n> Reviewed-by: Niklas Söderlund Reviewed-by: Laurent Pinchart \n> Signed-off-by: Jacopo Mondi \n> ---\n> src/android/camera_device.cpp | 20 ++------------------\n> 1 file changed, 2 insertions(+), 18 deletions(-)\n> \n> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> index 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> -- \n> 2.29.2\n> \n> _______________________________________________\n> libcamera-devel mailing list\n> libcamera-devel@lists.libcamera.org\n> https://lists.libcamera.org/listinfo/libcamera-devel","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 4AAD3BD80C\n\tfor ;\n\tWed, 13 Jan 2021 13:04:35 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 0E87E680D6;\n\tWed, 13 Jan 2021 14:04:35 +0100 (CET)","from mail-lj1-x22a.google.com (mail-lj1-x22a.google.com\n\t[IPv6:2a00:1450:4864:20::22a])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 5C40C6054E\n\tfor ;\n\tWed, 13 Jan 2021 14:04:33 +0100 (CET)","by mail-lj1-x22a.google.com with SMTP id w26so2453892ljo.4\n\tfor ;\n\tWed, 13 Jan 2021 05:04:33 -0800 (PST)","from localhost (h-209-203.A463.priv.bahnhof.se. [155.4.209.203])\n\tby smtp.gmail.com with ESMTPSA id\n\tc25sm205272lfm.52.2021.01.13.05.04.31\n\t(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n\tWed, 13 Jan 2021 05:04:31 -0800 (PST)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=ragnatech-se.20150623.gappssmtp.com\n\theader.i=@ragnatech-se.20150623.gappssmtp.com\n\theader.b=\"ck0OYjM5\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=ragnatech-se.20150623.gappssmtp.com; s=20150623;\n\th=date:from:to:cc:subject:message-id:references:mime-version\n\t:content-disposition:content-transfer-encoding:in-reply-to;\n\tbh=cD8nuy7gX+VsD72dvzjPhm84woefzF21JPdMMSxSj+c=;\n\tb=ck0OYjM5ZKph1QUuxCBWlk6vKBSgEQcQ3TWOFMQb4JKyb9qlfvYeXRSs9hk80636mx\n\tL6saO2L5VwZ5KEMR6A/BQreAbBzM5am2rvw0VjG5ursUZvOXDGroG03s5BqgGVbhqCsc\n\tptuQ9s95EBl1xOMuQO/Ccj8E7x8iYSgi9/oHja5K8i5xIzlc4tkr+fih7MNcFaumjiKI\n\tWmuObKkTrws2WhSuzvwWv0Htj8W1E7yH3OnjzpHOj2YQ40rktQAG6xhPtwyaB0ZUtQcR\n\tJcUNHzG31gVLSK7hBqPbCCNK8rS89pbItkB86BmAEYMvloXAF/qraZBP4YVVSJYzuxw2\n\t49JA==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:date:from:to:cc:subject:message-id:references\n\t:mime-version:content-disposition:content-transfer-encoding\n\t:in-reply-to;\n\tbh=cD8nuy7gX+VsD72dvzjPhm84woefzF21JPdMMSxSj+c=;\n\tb=ZSX9qQYq5ksbuzWMpq4uUV0iRCfUXspLI3PqKXo+VWyg8po/bmKtQhHeGnJNr99NPv\n\tvMsmxgdbaZq+K4Pj7BXRXtsmD+4LV9waE6sIpl8IATDQScDwLz9JZwmG/Xpa1Yy0MGPq\n\tNeWMWGMmqLxbrbyQLh5/MjVhjO78GjRbgSfgWdLbCvpQX6/YVc2rQERRAeg8ZyK7mSr5\n\tTvxMVDcsAq/ItfHYdK9gUt1BoKVtvKg6StcTxBbXn3TGo1aLPqaI20SCkyXpzuEJifB/\n\t9IFiibOcxcsceKokmZ+fIf3DPjHmNR7UPXcVSNJT4VBNQbTAQmSezEi1kdJn+/3Wf2ks\n\tNViQ==","X-Gm-Message-State":"AOAM533pFxso9zHF1WNgLKPqj8fuv5JB64eSJjvjPgtaJMjAL/F/cXMi\n\t+GxrUTGyLezuj9KeIW7g7bSBtAXEGotAHg==","X-Google-Smtp-Source":"ABdhPJxBJelpa5QNggMbKb4PldzFScTaRkk+4vdyInlf3CVI/pFlLm+YYwGCaMPJG/BgV7vW2zMh+w==","X-Received":"by 2002:a2e:8110:: with SMTP id d16mr939715ljg.280.1610543072849;\n\tWed, 13 Jan 2021 05:04:32 -0800 (PST)","Date":"Wed, 13 Jan 2021 14:04:31 +0100","From":"Niklas =?iso-8859-1?q?S=F6derlund?= ","To":"Jacopo Mondi ","Message-ID":"","References":"<20210107094735.11673-1-jacopo@jmondi.org>\n\t<20210107094735.11673-11-jacopo@jmondi.org>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20210107094735.11673-11-jacopo@jmondi.org>","Subject":"Re: [libcamera-devel] [PATCH v6 10/10] android: camera_device: Do\n\tnot default 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","Cc":"libcamera-devel@lists.libcamera.org","Content-Type":"text/plain; charset=\"iso-8859-1\"","Content-Transfer-Encoding":"quoted-printable","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":14543,"web_url":"https://patchwork.libcamera.org/comment/14543/","msgid":"<20210113153933.ocrvqqppvbuqklvg@uno.localdomain>","date":"2021-01-13T15:39:33","subject":"Re: [libcamera-devel] [PATCH v6 10/10] android: camera_device: Do\n\tnot default pixel array properties","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"content":"Hi Niklas,\n\nOn Wed, Jan 13, 2021 at 02:04:31PM +0100, Niklas Söderlund wrote:\n> Hi Jacopo,\n>\n> On 2021-01-07 10:47:35 +0100, Jacopo Mondi wrote:\n> > Now that the pixel array properties have been defaulted in the\n> > CameraSensor class (or in the pipeline handler, for the UVC use case),\n> > they will always be reported by the libcamera::Camera and there's no\n> > need to default them in the Camera HAL.\n> >\n> > Remove defaults and assume properties are always there.\n> >\n> > Reviewed-by: Niklas Söderlund \n> :-)\n>\n\nUps, bad copy&paste... I'll fix\n\nThanks\n j\n\n> > Reviewed-by: Laurent Pinchart \n> > Signed-off-by: Jacopo Mondi \n> > ---\n> > src/android/camera_device.cpp | 20 ++------------------\n> > 1 file changed, 2 insertions(+), 18 deletions(-)\n> >\n> > diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> > index 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> > --\n> > 2.29.2\n> >\n> > _______________________________________________\n> > libcamera-devel mailing list\n> > libcamera-devel@lists.libcamera.org\n> > https://lists.libcamera.org/listinfo/libcamera-devel\n>\n> --\n> Regards,\n> Niklas Söderlund","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 55EEBBD808\n\tfor ;\n\tWed, 13 Jan 2021 15:39:18 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id D8C50680D8;\n\tWed, 13 Jan 2021 16:39:17 +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 09D9F6054E\n\tfor ;\n\tWed, 13 Jan 2021 16:39:17 +0100 (CET)","from uno.localdomain (93-61-96-190.ip145.fastwebnet.it\n\t[93.61.96.190]) (Authenticated sender: jacopo@jmondi.org)\n\tby relay2-d.mail.gandi.net (Postfix) with ESMTPSA id 6E5754001D;\n\tWed, 13 Jan 2021 15:39:16 +0000 (UTC)"],"X-Originating-IP":"93.61.96.190","Date":"Wed, 13 Jan 2021 16:39:33 +0100","From":"Jacopo Mondi ","To":"Niklas =?utf-8?q?S=C3=B6derlund?= ","Message-ID":"<20210113153933.ocrvqqppvbuqklvg@uno.localdomain>","References":"<20210107094735.11673-1-jacopo@jmondi.org>\n\t<20210107094735.11673-11-jacopo@jmondi.org>\n\t","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"","Subject":"Re: [libcamera-devel] [PATCH v6 10/10] android: camera_device: Do\n\tnot default 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","Cc":"libcamera-devel@lists.libcamera.org","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]