[{"id":15503,"web_url":"https://patchwork.libcamera.org/comment/15503/","msgid":"<3be50d7e-8d5f-b7e8-83b5-9069263820d1@ideasonboard.com>","date":"2021-03-08T10:41:43","subject":"Re: [libcamera-devel] [PATCH 1/4] android: jpeg: exif: Fix and\n\texpand setRational","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"On 08/03/2021 10:13, Paul Elder wrote:\n> setRational was not working properly for EXIF tags in the GPS IFD.\n> Manually specify the size of the EXIF entry to fix this. While at it,\n> add support for setting multiple rationals, as that is a common use case\n> for rational EXIF tags.\n\nsetRational itself was working fine, but it is the lack of support for\nthe tags used within\n\n libexif::exif-entry.c::exif_entry_initialize(ExifEntry *e, ExifTag tag)\n\nwhich is the issue here.\n\nexif_entry_initialize() goes to great lengths to initialise tags for\ntheir size and even defaults. Removing that (by using our direct\nallocation with the 4 argument version of createEntry() means that we\nare no longer handling those intialisations for Rational types.\n\nThat will affect at least the following, which seem to be the only\nrational types initialised (yes, I see one of those groups is SRATIONAL\nso we don't handle those correctly yet either).\n\n> \n> \t/* SRATIONAL, 1 component, no default */\n> \tcase EXIF_TAG_EXPOSURE_BIAS_VALUE:\n> \tcase EXIF_TAG_BRIGHTNESS_VALUE:\n> \tcase EXIF_TAG_SHUTTER_SPEED_VALUE:\n> \t\te->components = 1;\n> \t\te->format = EXIF_FORMAT_SRATIONAL;\n> \t\te->size = exif_format_get_size (e->format) * e->components;\n> \t\te->data = exif_entry_alloc (e, e->size);\n> \t\tif (!e->data) { clear_entry(e); break; }\n> \t\tbreak;\n> \n> \t/* RATIONAL, 1 component, no default */\n> \tcase EXIF_TAG_EXPOSURE_TIME:\n> \tcase EXIF_TAG_FOCAL_PLANE_X_RESOLUTION:\n> \tcase EXIF_TAG_FOCAL_PLANE_Y_RESOLUTION:\n> \tcase EXIF_TAG_EXPOSURE_INDEX:\n> \tcase EXIF_TAG_FLASH_ENERGY:\n> \tcase EXIF_TAG_FNUMBER:\n> \tcase EXIF_TAG_FOCAL_LENGTH:\n> \tcase EXIF_TAG_SUBJECT_DISTANCE:\n> \tcase EXIF_TAG_MAX_APERTURE_VALUE:\n> \tcase EXIF_TAG_APERTURE_VALUE:\n> \tcase EXIF_TAG_COMPRESSED_BITS_PER_PIXEL:\n> \tcase EXIF_TAG_PRIMARY_CHROMATICITIES:\n> \tcase EXIF_TAG_DIGITAL_ZOOM_RATIO:\n> \t\te->components = 1;\n> \t\te->format = EXIF_FORMAT_RATIONAL;\n> \t\te->size = exif_format_get_size (e->format) * e->components;\n> \t\te->data = exif_entry_alloc (e, e->size);\n> \t\tif (!e->data) { clear_entry(e); break; }\n> \t\tbreak;\n> \n> \t/* RATIONAL, 1 component, default 72/1 */\n> \tcase EXIF_TAG_X_RESOLUTION:\n> \tcase EXIF_TAG_Y_RESOLUTION:\n> \t\te->components = 1;\n> \t\te->format = EXIF_FORMAT_RATIONAL;\n> \t\te->size = exif_format_get_size (e->format) * e->components;\n> \t\te->data = exif_entry_alloc (e, e->size);\n> \t\tif (!e->data) { clear_entry(e); break; }\n> \t\tr.numerator = 72;\n> \t\tr.denominator = 1;\n> \t\texif_set_rational (e->data, o, r);\n> \t\tbreak;\n> \n> \t/* RATIONAL, 2 components, no default */\n> \tcase EXIF_TAG_WHITE_POINT:\n> \t\te->components = 2;\n> \t\te->format = EXIF_FORMAT_RATIONAL;\n> \t\te->size = exif_format_get_size (e->format) * e->components;\n> \t\te->data = exif_entry_alloc (e, e->size);\n> \t\tif (!e->data) { clear_entry(e); break; }\n> \t\tbreak;\n> \n> \t/* RATIONAL, 6 components */\n> \tcase EXIF_TAG_REFERENCE_BLACK_WHITE:\n> \t\te->components = 6;\n> \t\te->format = EXIF_FORMAT_RATIONAL;\n> \t\te->size = exif_format_get_size (e->format) * e->components;\n> \t\te->data = exif_entry_alloc (e, e->size);\n> \t\tif (!e->data) { clear_entry(e); break; }\n> \t\tr.denominator = 1;\n> \t\tr.numerator = 0;\n> \t\texif_set_rational (e->data, o, r);\n> \t\tr.numerator = 255;\n> \t\texif_set_rational (\n> \t\t\te->data + exif_format_get_size (e->format), o, r);\n> \t\tr.numerator = 0;\n> \t\texif_set_rational (\n> \t\t\te->data + 2 * exif_format_get_size (e->format), o, r);\n> \t\tr.numerator = 255;\n> \t\texif_set_rational (\n> \t\t\te->data + 3 * exif_format_get_size (e->format), o, r);\n> \t\tr.numerator = 0;\n> \t\texif_set_rational (\n> \t\t\te->data + 4 * exif_format_get_size (e->format), o, r);\n> \t\tr.numerator = 255;\n> \t\texif_set_rational (\n> \t\t\te->data + 5 * exif_format_get_size (e->format), o, r);\n> \t\tbreak;\n\n\nAs the reality is that most of them are not initialised with a default\nvalue, I don't think that's too much of a problem, but we should be\naware of it.\n\n\nGiven that this leads us to better support for Rational generically, I\nthink this is a good way forwards, but could you add a note in the\ncommit message to say that Rational types are no longer initialised by\nthe exif library directly (as that has the consequence of not populating\ndefault values for EXIF_TAG_{X,Y}_RESOLUTION.\n\nWe won't use those defaults, so it doesn't matter - but we're changing\nthe behaviour - so we should note that.\n\n\n\n\n> This allows the GPS altitude to be set properly, and is part of the fix\n> to allow the following CTS test to pass:\n> - android.hardware.cts.CameraTest#testJpegExif\n> \n> Signed-off-by: Paul Elder \n> ---\n> src/android/jpeg/exif.cpp | 13 +++++++++++--\n> src/android/jpeg/exif.h | 2 ++\n> 2 files changed, 13 insertions(+), 2 deletions(-)\n> \n> diff --git a/src/android/jpeg/exif.cpp b/src/android/jpeg/exif.cpp\n> index fdd46070..e5a3e448 100644\n> --- a/src/android/jpeg/exif.cpp\n> +++ b/src/android/jpeg/exif.cpp\n> @@ -187,11 +187,20 @@ void Exif::setLong(ExifIfd ifd, ExifTag tag, uint32_t item)\n> \n> void Exif::setRational(ExifIfd ifd, ExifTag tag, ExifRational item)\n> {\n> -\tExifEntry *entry = createEntry(ifd, tag);\n> +\tExifRational items[] = { item };\n> +\tsetRational(ifd, tag, 1, items);\n> +}\n> +\n> +void Exif::setRational(ExifIfd ifd, ExifTag tag, uint32_t count, ExifRational items[])\n> +{\n> +\tExifEntry *entry = createEntry(ifd, tag, EXIF_FORMAT_RATIONAL,\n> +\t\t\t\t count, count * sizeof(ExifRational));\n\n\nThe library internally uses:\n exif_format_get_size (EXIF_FORMAT_RATIONAL);\n\nThat involves a lookup in a table, which I think we can avoid here, by\nusing sizeof(ExifRational) directly, but could you make sure they are\nthe same expected size (8?) and that nothing crazy is going on with any\npadding or such?\n\n\nOtherwise\n\nReviewed-by: Kieran Bingham \n\n\n> \tif (!entry)\n> \t\treturn;\n> \n> -\texif_set_rational(entry->data, order_, item);\n> +\tfor (size_t i = 0; i < count; i++)\n> +\t\texif_set_rational(entry->data + i * sizeof(ExifRational),\n> +\t\t\t\t order_, items[i]);\n> \texif_entry_unref(entry);\n> }\n> \n> diff --git a/src/android/jpeg/exif.h b/src/android/jpeg/exif.h\n> index b0d61402..e283d3fc 100644\n> --- a/src/android/jpeg/exif.h\n> +++ b/src/android/jpeg/exif.h\n> @@ -89,6 +89,8 @@ private:\n> \t\t const std::string &item,\n> \t\t StringEncoding encoding = NoEncoding);\n> \tvoid setRational(ExifIfd ifd, ExifTag tag, ExifRational item);\n> +\tvoid setRational(ExifIfd ifd, ExifTag tag, uint32_t count,\n> +\t\t\t ExifRational items[]);\n> \n> \tstd::tuple degreesToDMS(double decimalDegrees);\n> \tvoid setGPSDMS(ExifIfd ifd, ExifTag tag, int deg, int min, int sec);\n>","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 6B498BD1F1\n\tfor ;\n\tMon, 8 Mar 2021 10:41:48 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id DEF65602E6;\n\tMon, 8 Mar 2021 11:41:47 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id B9868602E6\n\tfor ;\n\tMon, 8 Mar 2021 11:41:46 +0100 (CET)","from [192.168.0.20]\n\t(cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 74815AC1;\n\tMon, 8 Mar 2021 11:41:45 +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=\"RE73UrLS\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1615200105;\n\tbh=ibWrUeVReT1+dgWjS3/3iZ0Uw02ICDq2T2wYj1GhNEQ=;\n\th=Reply-To:Subject:To:References:From:Date:In-Reply-To:From;\n\tb=RE73UrLSUtDZDAscwjKeV2clzv5VKVmIWR3YqFdD5ghsacQkG6pm3b1Pygz2UPnQd\n\tC9vNIH0mZ46/yu5bH4C0RwDWegl1XsjxNxdRFTEw3kLmMowyt8D1FBNiGDRuHM22U9\n\tw3Us0jXQV7Q2B0oo1YRS1Mr7FyM6ZH/jTF9fhbZ4=","To":"Paul Elder ,\n\tlibcamera-devel@lists.libcamera.org","References":"<20210308101356.59333-1-paul.elder@ideasonboard.com>\n\t<20210308101356.59333-2-paul.elder@ideasonboard.com>","From":"Kieran Bingham ","Autocrypt":"addr=kieran.bingham@ideasonboard.com; keydata=\n\t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\n\tWZw01QYHU/GUV/zHJSFk","Organization":"Ideas on Board","Message-ID":"<3be50d7e-8d5f-b7e8-83b5-9069263820d1@ideasonboard.com>","Date":"Mon, 8 Mar 2021 10:41:43 +0000","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101\n\tThunderbird/68.10.0","MIME-Version":"1.0","In-Reply-To":"<20210308101356.59333-2-paul.elder@ideasonboard.com>","Content-Language":"en-GB","Subject":"Re: [libcamera-devel] [PATCH 1/4] android: jpeg: exif: Fix and\n\texpand setRational","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","Reply-To":"kieran.bingham@ideasonboard.com","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}},{"id":15512,"web_url":"https://patchwork.libcamera.org/comment/15512/","msgid":"","date":"2021-03-08T13:38:40","subject":"Re: [libcamera-devel] [PATCH 1/4] android: jpeg: exif: Fix and\n\texpand setRational","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 Mon, Mar 08, 2021 at 07:13:53PM +0900, Paul Elder wrote:\n> setRational was not working properly for EXIF tags in the GPS IFD.\n> Manually specify the size of the EXIF entry to fix this. While at it,\n> add support for setting multiple rationals, as that is a common use case\n> for rational EXIF tags.\n> \n> This allows the GPS altitude to be set properly, and is part of the fix\n> to allow the following CTS test to pass:\n> - android.hardware.cts.CameraTest#testJpegExif\n> \n> Signed-off-by: Paul Elder \n> ---\n> src/android/jpeg/exif.cpp | 13 +++++++++++--\n> src/android/jpeg/exif.h | 2 ++\n> 2 files changed, 13 insertions(+), 2 deletions(-)\n> \n> diff --git a/src/android/jpeg/exif.cpp b/src/android/jpeg/exif.cpp\n> index fdd46070..e5a3e448 100644\n> --- a/src/android/jpeg/exif.cpp\n> +++ b/src/android/jpeg/exif.cpp\n> @@ -187,11 +187,20 @@ void Exif::setLong(ExifIfd ifd, ExifTag tag, uint32_t item)\n> \n> void Exif::setRational(ExifIfd ifd, ExifTag tag, ExifRational item)\n> {\n> -\tExifEntry *entry = createEntry(ifd, tag);\n> +\tExifRational items[] = { item };\n> +\tsetRational(ifd, tag, 1, items);\n> +}\n> +\n> +void Exif::setRational(ExifIfd ifd, ExifTag tag, uint32_t count, ExifRational items[])\n\nOur way to pass pointer and number of elements is called Span :-)\n\nvoid Exif::setRational(ExifIfd ifd, ExifTag tag, Span items)\n\nYou can then replace count with items.size() below. items[i] should work\nunchanged. And above, that would be\n\nvoid Exif::setRational(ExifIfd ifd, ExifTag tag, ExifRational item)\n{\n\tsetRational(ifd, tag, { &items, 1 });\n}\n\nWith this, and Kieran's comments addressed,\n\nReviewed-by: Laurent Pinchart \n\n> +{\n> +\tExifEntry *entry = createEntry(ifd, tag, EXIF_FORMAT_RATIONAL,\n> +\t\t\t\t count, count * sizeof(ExifRational));\n> \tif (!entry)\n> \t\treturn;\n> \n> -\texif_set_rational(entry->data, order_, item);\n> +\tfor (size_t i = 0; i < count; i++)\n> +\t\texif_set_rational(entry->data + i * sizeof(ExifRational),\n> +\t\t\t\t order_, items[i]);\n> \texif_entry_unref(entry);\n> }\n> \n> diff --git a/src/android/jpeg/exif.h b/src/android/jpeg/exif.h\n> index b0d61402..e283d3fc 100644\n> --- a/src/android/jpeg/exif.h\n> +++ b/src/android/jpeg/exif.h\n> @@ -89,6 +89,8 @@ private:\n> \t\t const std::string &item,\n> \t\t StringEncoding encoding = NoEncoding);\n> \tvoid setRational(ExifIfd ifd, ExifTag tag, ExifRational item);\n> +\tvoid setRational(ExifIfd ifd, ExifTag tag, uint32_t count,\n> +\t\t\t ExifRational items[]);\n> \n> \tstd::tuple degreesToDMS(double decimalDegrees);\n> \tvoid setGPSDMS(ExifIfd ifd, ExifTag tag, int deg, int min, int sec);","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 6D985BD80C\n\tfor ;\n\tMon, 8 Mar 2021 13:39:12 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id BBB8168A9C;\n\tMon, 8 Mar 2021 14:39:11 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 54941602ED\n\tfor ;\n\tMon, 8 Mar 2021 14:39: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 C14AFAC1;\n\tMon, 8 Mar 2021 14:39:10 +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=\"dP+V5iAA\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1615210751;\n\tbh=Cqrr4TbtWFNvc4HizqsZrKfOMRCuxXS9OZPb4bywjyY=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=dP+V5iAAkSimE30SkqVEXgp/ZfrJcIVuqTNAnlBiNZcDduH8joFWwfnj6ZwBaOFMU\n\tefROM1Q6xFRcPK+Br/3Rmb/adsq7RT9DS1CHdvC6e9SGd1bSeCmXVx2crMY2hw1E+N\n\tvBQaN+Wh1yjA99gprRZQ0usXw0HNZH9ntZb0nbmc=","Date":"Mon, 8 Mar 2021 15:38:40 +0200","From":"Laurent Pinchart ","To":"Paul Elder ","Message-ID":"","References":"<20210308101356.59333-1-paul.elder@ideasonboard.com>\n\t<20210308101356.59333-2-paul.elder@ideasonboard.com>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<20210308101356.59333-2-paul.elder@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH 1/4] android: jpeg: exif: Fix and\n\texpand setRational","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":15513,"web_url":"https://patchwork.libcamera.org/comment/15513/","msgid":"","date":"2021-03-08T13:51:09","subject":"Re: [libcamera-devel] [PATCH 1/4] android: jpeg: exif: Fix and\n\texpand setRational","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"content":"Hello,\n\nOn Mon, Mar 08, 2021 at 10:41:43AM +0000, Kieran Bingham wrote:\n> On 08/03/2021 10:13, Paul Elder wrote:\n> > setRational was not working properly for EXIF tags in the GPS IFD.\n> > Manually specify the size of the EXIF entry to fix this. While at it,\n> > add support for setting multiple rationals, as that is a common use case\n> > for rational EXIF tags.\n> \n> setRational itself was working fine, but it is the lack of support for\n> the tags used within\n> \n> libexif::exif-entry.c::exif_entry_initialize(ExifEntry *e, ExifTag tag)\n> \n> which is the issue here.\n> \n> exif_entry_initialize() goes to great lengths to initialise tags for\n> their size and even defaults. Removing that (by using our direct\n> allocation with the 4 argument version of createEntry() means that we\n> are no longer handling those intialisations for Rational types.\n> \n> That will affect at least the following, which seem to be the only\n> rational types initialised (yes, I see one of those groups is SRATIONAL\n> so we don't handle those correctly yet either).\n> \n> > \n> > \t/* SRATIONAL, 1 component, no default */\n> > \tcase EXIF_TAG_EXPOSURE_BIAS_VALUE:\n> > \tcase EXIF_TAG_BRIGHTNESS_VALUE:\n> > \tcase EXIF_TAG_SHUTTER_SPEED_VALUE:\n> > \t\te->components = 1;\n> > \t\te->format = EXIF_FORMAT_SRATIONAL;\n> > \t\te->size = exif_format_get_size (e->format) * e->components;\n> > \t\te->data = exif_entry_alloc (e, e->size);\n> > \t\tif (!e->data) { clear_entry(e); break; }\n> > \t\tbreak;\n> > \n> > \t/* RATIONAL, 1 component, no default */\n> > \tcase EXIF_TAG_EXPOSURE_TIME:\n> > \tcase EXIF_TAG_FOCAL_PLANE_X_RESOLUTION:\n> > \tcase EXIF_TAG_FOCAL_PLANE_Y_RESOLUTION:\n> > \tcase EXIF_TAG_EXPOSURE_INDEX:\n> > \tcase EXIF_TAG_FLASH_ENERGY:\n> > \tcase EXIF_TAG_FNUMBER:\n> > \tcase EXIF_TAG_FOCAL_LENGTH:\n> > \tcase EXIF_TAG_SUBJECT_DISTANCE:\n> > \tcase EXIF_TAG_MAX_APERTURE_VALUE:\n> > \tcase EXIF_TAG_APERTURE_VALUE:\n> > \tcase EXIF_TAG_COMPRESSED_BITS_PER_PIXEL:\n> > \tcase EXIF_TAG_PRIMARY_CHROMATICITIES:\n> > \tcase EXIF_TAG_DIGITAL_ZOOM_RATIO:\n> > \t\te->components = 1;\n> > \t\te->format = EXIF_FORMAT_RATIONAL;\n> > \t\te->size = exif_format_get_size (e->format) * e->components;\n> > \t\te->data = exif_entry_alloc (e, e->size);\n> > \t\tif (!e->data) { clear_entry(e); break; }\n> > \t\tbreak;\n> > \n> > \t/* RATIONAL, 1 component, default 72/1 */\n> > \tcase EXIF_TAG_X_RESOLUTION:\n> > \tcase EXIF_TAG_Y_RESOLUTION:\n> > \t\te->components = 1;\n> > \t\te->format = EXIF_FORMAT_RATIONAL;\n> > \t\te->size = exif_format_get_size (e->format) * e->components;\n> > \t\te->data = exif_entry_alloc (e, e->size);\n> > \t\tif (!e->data) { clear_entry(e); break; }\n> > \t\tr.numerator = 72;\n> > \t\tr.denominator = 1;\n> > \t\texif_set_rational (e->data, o, r);\n> > \t\tbreak;\n> > \n> > \t/* RATIONAL, 2 components, no default */\n> > \tcase EXIF_TAG_WHITE_POINT:\n> > \t\te->components = 2;\n> > \t\te->format = EXIF_FORMAT_RATIONAL;\n> > \t\te->size = exif_format_get_size (e->format) * e->components;\n> > \t\te->data = exif_entry_alloc (e, e->size);\n> > \t\tif (!e->data) { clear_entry(e); break; }\n> > \t\tbreak;\n> > \n> > \t/* RATIONAL, 6 components */\n> > \tcase EXIF_TAG_REFERENCE_BLACK_WHITE:\n> > \t\te->components = 6;\n> > \t\te->format = EXIF_FORMAT_RATIONAL;\n> > \t\te->size = exif_format_get_size (e->format) * e->components;\n> > \t\te->data = exif_entry_alloc (e, e->size);\n> > \t\tif (!e->data) { clear_entry(e); break; }\n> > \t\tr.denominator = 1;\n> > \t\tr.numerator = 0;\n> > \t\texif_set_rational (e->data, o, r);\n> > \t\tr.numerator = 255;\n> > \t\texif_set_rational (\n> > \t\t\te->data + exif_format_get_size (e->format), o, r);\n> > \t\tr.numerator = 0;\n> > \t\texif_set_rational (\n> > \t\t\te->data + 2 * exif_format_get_size (e->format), o, r);\n> > \t\tr.numerator = 255;\n> > \t\texif_set_rational (\n> > \t\t\te->data + 3 * exif_format_get_size (e->format), o, r);\n> > \t\tr.numerator = 0;\n> > \t\texif_set_rational (\n> > \t\t\te->data + 4 * exif_format_get_size (e->format), o, r);\n> > \t\tr.numerator = 255;\n> > \t\texif_set_rational (\n> > \t\t\te->data + 5 * exif_format_get_size (e->format), o, r);\n> > \t\tbreak;\n> \n> As the reality is that most of them are not initialised with a default\n> value, I don't think that's too much of a problem, but we should be\n> aware of it.\n> \n> Given that this leads us to better support for Rational generically, I\n> think this is a good way forwards, but could you add a note in the\n> commit message to say that Rational types are no longer initialised by\n> the exif library directly (as that has the consequence of not populating\n> default values for EXIF_TAG_{X,Y}_RESOLUTION.\n> \n> We won't use those defaults, so it doesn't matter - but we're changing\n> the behaviour - so we should note that.\n\nIt's a bit annoying, it would be nice if we could still benefit from the\ninitialization, although I don't expect lots of changes in libexif that\nwould cause breakages later.\n\nMaybe we could, in setRational(), check the tag, and call the simple or\nextended version of createEntry() accordingly ? It's a bit of a layering\nviolation and isn't very nice. Up to you, I'd be fine either way.\n\n> > This allows the GPS altitude to be set properly, and is part of the fix\n> > to allow the following CTS test to pass:\n> > - android.hardware.cts.CameraTest#testJpegExif\n> > \n> > Signed-off-by: Paul Elder \n> > ---\n> > src/android/jpeg/exif.cpp | 13 +++++++++++--\n> > src/android/jpeg/exif.h | 2 ++\n> > 2 files changed, 13 insertions(+), 2 deletions(-)\n> > \n> > diff --git a/src/android/jpeg/exif.cpp b/src/android/jpeg/exif.cpp\n> > index fdd46070..e5a3e448 100644\n> > --- a/src/android/jpeg/exif.cpp\n> > +++ b/src/android/jpeg/exif.cpp\n> > @@ -187,11 +187,20 @@ void Exif::setLong(ExifIfd ifd, ExifTag tag, uint32_t item)\n> > \n> > void Exif::setRational(ExifIfd ifd, ExifTag tag, ExifRational item)\n> > {\n> > -\tExifEntry *entry = createEntry(ifd, tag);\n> > +\tExifRational items[] = { item };\n> > +\tsetRational(ifd, tag, 1, items);\n> > +}\n> > +\n> > +void Exif::setRational(ExifIfd ifd, ExifTag tag, uint32_t count, ExifRational items[])\n> > +{\n> > +\tExifEntry *entry = createEntry(ifd, tag, EXIF_FORMAT_RATIONAL,\n> > +\t\t\t\t count, count * sizeof(ExifRational));\n> \n> The library internally uses:\n> exif_format_get_size (EXIF_FORMAT_RATIONAL);\n> \n> That involves a lookup in a table, which I think we can avoid here, by\n> using sizeof(ExifRational) directly, but could you make sure they are\n> the same expected size (8?) and that nothing crazy is going on with any\n> padding or such?\n> \n> Otherwise\n> \n> Reviewed-by: Kieran Bingham \n> \n> > \tif (!entry)\n> > \t\treturn;\n> > \n> > -\texif_set_rational(entry->data, order_, item);\n> > +\tfor (size_t i = 0; i < count; i++)\n> > +\t\texif_set_rational(entry->data + i * sizeof(ExifRational),\n> > +\t\t\t\t order_, items[i]);\n> > \texif_entry_unref(entry);\n> > }\n> > \n> > diff --git a/src/android/jpeg/exif.h b/src/android/jpeg/exif.h\n> > index b0d61402..e283d3fc 100644\n> > --- a/src/android/jpeg/exif.h\n> > +++ b/src/android/jpeg/exif.h\n> > @@ -89,6 +89,8 @@ private:\n> > \t\t const std::string &item,\n> > \t\t StringEncoding encoding = NoEncoding);\n> > \tvoid setRational(ExifIfd ifd, ExifTag tag, ExifRational item);\n> > +\tvoid setRational(ExifIfd ifd, ExifTag tag, uint32_t count,\n> > +\t\t\t ExifRational items[]);\n> > \n> > \tstd::tuple degreesToDMS(double decimalDegrees);\n> > \tvoid setGPSDMS(ExifIfd ifd, ExifTag tag, int deg, int min, int sec);","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 C787EBD1F1\n\tfor ;\n\tMon, 8 Mar 2021 13:51:42 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 2A4DD68AA0;\n\tMon, 8 Mar 2021 14:51:42 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 884D1602ED\n\tfor ;\n\tMon, 8 Mar 2021 14:51:40 +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 EB25BAC1;\n\tMon, 8 Mar 2021 14:51:39 +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=\"o8ALFyiT\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1615211500;\n\tbh=D3qolTGxhKjQBzqpxX0bvzxmfqhkGYYJtB6kmcAODRc=;\n\th=Date:From:To:Cc:Subject:References:In-Reply-To:From;\n\tb=o8ALFyiTON+9Slf9YiAQ7t9CEN7eelgRbIjQ9dggKDcS2YtQMnTqApgpOpBNaHO4v\n\tVsPFSCCWwY22iX0HGPt417kr0v4PTskd8PpKXF6FrB++tCawNDt4sdP6RhqpnO0rfy\n\t8py5jsW8i7PJpIv6vQaC5z8SXux85yJB570+OwHM=","Date":"Mon, 8 Mar 2021 15:51:09 +0200","From":"Laurent Pinchart ","To":"Kieran Bingham ","Message-ID":"","References":"<20210308101356.59333-1-paul.elder@ideasonboard.com>\n\t<20210308101356.59333-2-paul.elder@ideasonboard.com>\n\t<3be50d7e-8d5f-b7e8-83b5-9069263820d1@ideasonboard.com>","MIME-Version":"1.0","Content-Disposition":"inline","In-Reply-To":"<3be50d7e-8d5f-b7e8-83b5-9069263820d1@ideasonboard.com>","Subject":"Re: [libcamera-devel] [PATCH 1/4] android: jpeg: exif: Fix and\n\texpand setRational","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\" "}}]