[{"id":14840,"web_url":"https://patchwork.libcamera.org/comment/14840/","msgid":"<20210128105156.772vvquw44vvga35@uno.localdomain>","date":"2021-01-28T10:51:56","subject":"Re: [libcamera-devel] [PATCH] android: camera_device: Fix exposure\n\ttime tag in exif and android","submitter":{"id":3,"url":"https://patchwork.libcamera.org/api/people/3/","name":"Jacopo Mondi","email":"jacopo@jmondi.org"},"content":"Hi Paul,\n\nOn Thu, Jan 28, 2021 at 07:22:14PM +0900, Paul Elder wrote:\n> The exposure time libcamera control is in microseconds while android and\n> our exif component use nanoseconds. Convert it appropriately.\n\nMy bad! Sorry about overlooking this\n(you can write ExposureTime as it's the actual control name)\n\n>\n> CTS also expects the exposure time exif tag to match the exposure time\n> set in the android result metadata. Fix it.\n\nCorrect, looks like a separate patch though, but ok...\n\n>\n> Signed-off-by: Paul Elder \n> ---\n> src/android/camera_device.cpp | 2 +-\n> src/android/jpeg/post_processor_jpeg.cpp | 3 ++-\n> 2 files changed, 3 insertions(+), 2 deletions(-)\n>\n> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> index f5066709..36382941 100644\n> --- a/src/android/camera_device.cpp\n> +++ b/src/android/camera_device.cpp\n> @@ -2058,7 +2058,7 @@ CameraDevice::getResultMetadata(Camera3RequestDescriptor *descriptor,\n> \t}\n>\n> \tif (metadata.contains(controls::ExposureTime)) {\n> -\t\tint32_t exposure = metadata.get(controls::ExposureTime);\n> +\t\tint64_t exposure = metadata.get(controls::ExposureTime) * 1000;\n> \t\tresultMetadata->addEntry(ANDROID_SENSOR_EXPOSURE_TIME,\n> \t}\n> diff --git a/src/android/jpeg/post_processor_jpeg.cpp b/src/android/jpeg/post_processor_jpeg.cpp\n> index cac0087b..6250b050 100644\n> --- a/src/android/jpeg/post_processor_jpeg.cpp\n> +++ b/src/android/jpeg/post_processor_jpeg.cpp\n> @@ -113,7 +113,8 @@ int PostProcessorJpeg::process(const FrameBuffer &source,\n> \texif.setTimestamp(std::time(nullptr), 0ms);\n>\n> \t/* \\todo Get this information from libcamera::Request::metadata */\n> -\texif.setExposureTime(0);\n> +\tret = resultMetadata->getEntry(ANDROID_SENSOR_EXPOSURE_TIME, &entry);\n> +\texif.setExposureTime(ret ? *entry.data.i64 : 0);\n\nIf I'm not mistaken, this is the first getEntry() we call on the\nresult metadata, that has to be populated already by out\ngetResultMetadata().\n\nIf think it's fine, we need a single pass to convert libcamera\ncontrols to Android format, and indeed the EXIF tags should reflect\nthe Android expected format.\n\nCould you remove the \\todo then ?\n\nThe patch content looks good\nReviewed-by: Jacopo Mondi \n\nThanks\n j\n\n> \tret = requestMetadata.getEntry(ANDROID_LENS_APERTURE, &entry);\n> \tif (ret)\n> \t\texif.setAperture(*entry.data.f);\n> --\n> 2.27.0\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 4D802BD808\n\tfor ;\n\tThu, 28 Jan 2021 10:51:39 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id CB4C668386;\n\tThu, 28 Jan 2021 11:51:38 +0100 (CET)","from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net\n\t[217.70.183.197])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id A325C6030A\n\tfor ;\n\tThu, 28 Jan 2021 11:51:37 +0100 (CET)","from uno.localdomain (93-34-118-233.ip49.fastwebnet.it\n\t[93.34.118.233]) (Authenticated sender: jacopo@jmondi.org)\n\tby relay5-d.mail.gandi.net (Postfix) with ESMTPSA id 083D71C0017;\n\tThu, 28 Jan 2021 10:51:35 +0000 (UTC)"],"X-Originating-IP":"93.34.118.233","Date":"Thu, 28 Jan 2021 11:51:56 +0100","From":"Jacopo Mondi ","To":"Paul Elder ","Message-ID":"<20210128105156.772vvquw44vvga35@uno.localdomain>","References":"<20210128102214.160250-1-paul.elder@ideasonboard.com>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20210128102214.160250-1-paul.elder@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH] android: camera_device: Fix exposure\n\ttime tag in exif and android","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=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":14845,"web_url":"https://patchwork.libcamera.org/comment/14845/","msgid":"","date":"2021-01-28T21:15:51","subject":"Re: [libcamera-devel] [PATCH] android: camera_device: Fix exposure\n\ttime tag in exif and android","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hi Paul,\n\nThank you for the patch.\n\nOn Thu, Jan 28, 2021 at 07:22:14PM +0900, Paul Elder wrote:\n> The exposure time libcamera control is in microseconds while android and\n> our exif component use nanoseconds. Convert it appropriately.\n> \n> CTS also expects the exposure time exif tag to match the exposure time\n> set in the android result metadata. Fix it.\n> \n> Signed-off-by: Paul Elder \n> ---\n> src/android/camera_device.cpp | 2 +-\n> src/android/jpeg/post_processor_jpeg.cpp | 3 ++-\n> 2 files changed, 3 insertions(+), 2 deletions(-)\n> \n> diff --git a/src/android/camera_device.cpp b/src/android/camera_device.cpp\n> index f5066709..36382941 100644\n> --- a/src/android/camera_device.cpp\n> +++ b/src/android/camera_device.cpp\n> @@ -2058,7 +2058,7 @@ CameraDevice::getResultMetadata(Camera3RequestDescriptor *descriptor,\n> \t}\n> \n> \tif (metadata.contains(controls::ExposureTime)) {\n> -\t\tint32_t exposure = metadata.get(controls::ExposureTime);\n> +\t\tint64_t exposure = metadata.get(controls::ExposureTime) * 1000;\n\nThe calculation will overflow for long exposure times.\n\n\t\tint64_t exposure = metadata.get(controls::ExposureTime) * 1000ULL;\n\nAfter addressing Jacopo's comments,\n\nReviewed-by: Laurent Pinchart \n\n> \t\tresultMetadata->addEntry(ANDROID_SENSOR_EXPOSURE_TIME,\n> \t\t\t\t\t &exposure, 1);\n> \t}\n> diff --git a/src/android/jpeg/post_processor_jpeg.cpp b/src/android/jpeg/post_processor_jpeg.cpp\n> index cac0087b..6250b050 100644\n> --- a/src/android/jpeg/post_processor_jpeg.cpp\n> +++ b/src/android/jpeg/post_processor_jpeg.cpp\n> @@ -113,7 +113,8 @@ int PostProcessorJpeg::process(const FrameBuffer &source,\n> \texif.setTimestamp(std::time(nullptr), 0ms);\n> \n> \t/* \\todo Get this information from libcamera::Request::metadata */\n> -\texif.setExposureTime(0);\n> +\tret = resultMetadata->getEntry(ANDROID_SENSOR_EXPOSURE_TIME, &entry);\n> +\texif.setExposureTime(ret ? *entry.data.i64 : 0);\n> \tret = requestMetadata.getEntry(ANDROID_LENS_APERTURE, &entry);\n> \tif (ret)\n> \t\texif.setAperture(*entry.data.f);","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 491C7BD808\n\tfor ;\n\tThu, 28 Jan 2021 21:16:14 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id BE2646838E;\n\tThu, 28 Jan 2021 22:16:13 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id E43236030A\n\tfor ;\n\tThu, 28 Jan 2021 22:16:11 +0100 (CET)","from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi\n\t[62.78.145.57])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 5B54458E;\n\tThu, 28 Jan 2021 22:16:11 +0100 (CET)"],"Authentication-Results":"lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=ideasonboard.com header.i=@ideasonboard.com\n\theader.b=\"taNceSsj\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1611868571;\n\tbh=jh3TDuOhWtIr3PfPToBMdSXrkRnAgBcOA25D0STv6a0=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=taNceSsjkq9pweB4tm/zNKKy/2WAkmAmhOVjEzuYJnmxaSVB06gcSIi4fh7lrHNhq\n\tNXf/fHFjuZk0soB+9VsAEGD41CFpAJdAsSjUc6R0wkjRrZk0pqbcQTmEychvf72fqZ\n\t12/Z9DvFFvZtAA89/f7j2x7qBCTQh6y3VggiKxW8=","Date":"Thu, 28 Jan 2021 23:15:51 +0200","From":"Laurent Pinchart ","To":"Paul Elder ","Message-ID":"","References":"<20210128102214.160250-1-paul.elder@ideasonboard.com>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20210128102214.160250-1-paul.elder@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH] android: camera_device: Fix exposure\n\ttime tag in exif and android","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=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]