{"id":10968,"url":"https://patchwork.libcamera.org/api/1.1/patches/10968/?format=json","web_url":"https://patchwork.libcamera.org/patch/10968/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/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":"<20210123051704.188117-4-paul.elder@ideasonboard.com>","date":"2021-01-23T05:16:59","name":"[libcamera-devel,v3,3/8] android: jpeg: exif: Add functions for setting various values","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"c3a1892693dde32301b506c2a93ce8cce337a118","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/1.1/people/17/?format=json","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"delegate":{"id":17,"url":"https://patchwork.libcamera.org/api/1.1/users/17/?format=json","username":"epaul","first_name":"Paul","last_name":"Elder","email":"paul.elder@ideasonboard.com"},"mbox":"https://patchwork.libcamera.org/patch/10968/mbox/","series":[{"id":1601,"url":"https://patchwork.libcamera.org/api/1.1/series/1601/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1601","date":"2021-01-23T05:16:56","name":"Fill in android result metadata and EXIF tabs","version":3,"mbox":"https://patchwork.libcamera.org/series/1601/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/10968/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/10968/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 0A147C0F2B\n\tfor ;\n\tSat, 23 Jan 2021 05:17:22 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id C221F68295;\n\tSat, 23 Jan 2021 06:17:21 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 9E5E96827C\n\tfor ;\n\tSat, 23 Jan 2021 06:17:20 +0100 (CET)","from pyrite.rasen.tech (unknown\n\t[IPv6:2400:4051:61:600:2c71:1b79:d06d:5032])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id E262F813;\n\tSat, 23 Jan 2021 06:17:18 +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=\"H8doAEnR\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1611379040;\n\tbh=I8NnV13AVZAQZMyF+hNBZ2sAh2pCMvJktxKjQio76s4=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=H8doAEnR5NIq8VnbDfBspED3o+Gi8HT4bmpCL5C1XRdPxQu76JsKjoThZGFkHZJKS\n\tVc+SHVVXQIfaGMYJs4Vm/xs0e9bkxU2Vty/dvI6T8yodNMYUuyBi1QqSEKaN8rFsrH\n\tQ8cupgzOjge0Mnm2e0ZN3kVc6sgLc/Ko075UEs4o=","From":"Paul Elder ","To":"libcamera-devel@lists.libcamera.org","Date":"Sat, 23 Jan 2021 14:16:59 +0900","Message-Id":"<20210123051704.188117-4-paul.elder@ideasonboard.com>","X-Mailer":"git-send-email 2.27.0","In-Reply-To":"<20210123051704.188117-1-paul.elder@ideasonboard.com>","References":"<20210123051704.188117-1-paul.elder@ideasonboard.com>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v3 3/8] android: jpeg: exif: Add functions\n\tfor setting various values","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=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "},"content":"Add functions for setting the following EXIF fields:\n\n- GPSDatestamp\n- GPSTimestamp\n- GPSLocation\n - GPSLatitudeRef\n - GPSLatitude\n - GPSLongitudeRef\n - GPSLongitude\n - GPSAltitudeRef\n - GPSAltitude\n- GPSProcessingMethod\n- FocalLength\n- ExposureTime\n- FNumber\n- ISO\n- Flash\n- WhiteBalance\n- SubsecTime\n- SubsecTimeOriginal\n- SubsecTimeDigitized\n\nThese are in preparation for fixing the following CTS tests:\n\n- android.hardware.camera2.cts.StillCaptureTest#testFocalLengths\n- android.hardware.camera2.cts.StillCaptureTest#testJpegExif\n\nSigned-off-by: Paul Elder \nReviewed-by: Laurent Pinchart \n\n---\nChanges in v3:\n- merge setting subsec into setting the main timestamp\n\nChanges in v2:\n- some cosmetic and precision changes\n- use the new setString\n---\n src/android/jpeg/exif.cpp | 175 +++++++++++++++++++++++++++++++++++---\n src/android/jpeg/exif.h | 38 ++++++++-\n 2 files changed, 198 insertions(+), 15 deletions(-)","diff":"diff --git a/src/android/jpeg/exif.cpp b/src/android/jpeg/exif.cpp\nindex d4f86006..06cb4808 100644\n--- a/src/android/jpeg/exif.cpp\n+++ b/src/android/jpeg/exif.cpp\n@@ -7,7 +7,9 @@\n \n #include \"exif.h\"\n \n+#include \n #include \n+#include \n #include \n \n #include \"libcamera/internal/log.h\"\n@@ -151,6 +153,16 @@ ExifEntry *Exif::createEntry(ExifIfd ifd, ExifTag tag, ExifFormat format,\n \treturn entry;\n }\n \n+void Exif::setByte(ExifIfd ifd, ExifTag tag, uint8_t item)\n+{\n+\tExifEntry *entry = createEntry(ifd, tag, EXIF_FORMAT_BYTE, 1, 1);\n+\tif (!entry)\n+\t\treturn;\n+\n+\tentry->data[0] = item;\n+\texif_entry_unref(entry);\n+}\n+\n void Exif::setShort(ExifIfd ifd, ExifTag tag, uint16_t item)\n {\n \tExifEntry *entry = createEntry(ifd, tag);\n@@ -268,7 +280,7 @@ void Exif::setSize(const Size &size)\n \tsetLong(EXIF_IFD_EXIF, EXIF_TAG_PIXEL_X_DIMENSION, size.width);\n }\n \n-void Exif::setTimestamp(time_t timestamp)\n+void Exif::setTimestamp(time_t timestamp, uint64_t subsec)\n {\n \tstruct tm tm;\n \tlocaltime_r(×tamp, &tm);\n@@ -283,19 +295,121 @@ void Exif::setTimestamp(time_t timestamp)\n \n \t/* Query and set timezone information if available. */\n \tint r = strftime(str, sizeof(str), \"%z\", &tm);\n-\tif (r > 0) {\n-\t\tstd::string tz(str);\n-\t\ttz.insert(3, 1, ':');\n-\t\tsetString(EXIF_IFD_EXIF,\n-\t\t\t static_cast(_ExifTag::OFFSET_TIME),\n-\t\t\t EXIF_FORMAT_ASCII, tz);\n-\t\tsetString(EXIF_IFD_EXIF,\n-\t\t\t static_cast(_ExifTag::OFFSET_TIME_ORIGINAL),\n-\t\t\t EXIF_FORMAT_ASCII, tz);\n-\t\tsetString(EXIF_IFD_EXIF,\n-\t\t\t static_cast(_ExifTag::OFFSET_TIME_DIGITIZED),\n-\t\t\t EXIF_FORMAT_ASCII, tz);\n-\t}\n+\tif (r <= 0)\n+\t\treturn;\n+\n+\tstd::string tz(str);\n+\ttz.insert(3, 1, ':');\n+\tsetString(EXIF_IFD_EXIF,\n+\t\t static_cast(_ExifTag::OFFSET_TIME),\n+\t\t EXIF_FORMAT_ASCII, tz);\n+\tsetString(EXIF_IFD_EXIF,\n+\t\t static_cast(_ExifTag::OFFSET_TIME_ORIGINAL),\n+\t\t EXIF_FORMAT_ASCII, tz);\n+\tsetString(EXIF_IFD_EXIF,\n+\t\t static_cast(_ExifTag::OFFSET_TIME_DIGITIZED),\n+\t\t EXIF_FORMAT_ASCII, tz);\n+\n+\tsetString(EXIF_IFD_EXIF, EXIF_TAG_SUB_SEC_TIME,\n+\t\t EXIF_FORMAT_ASCII, std::to_string(subsec));\n+\tsetString(EXIF_IFD_EXIF, EXIF_TAG_SUB_SEC_TIME_ORIGINAL,\n+\t\t EXIF_FORMAT_ASCII, std::to_string(subsec));\n+\tsetString(EXIF_IFD_EXIF, EXIF_TAG_SUB_SEC_TIME_DIGITIZED,\n+\t\t EXIF_FORMAT_ASCII, std::to_string(subsec));\n+}\n+\n+void Exif::setGPSDateTimestamp(time_t timestamp)\n+{\n+\tstruct tm tm;\n+\tgmtime_r(×tamp, &tm);\n+\n+\tchar str[11];\n+\tstrftime(str, sizeof(str), \"%Y:%m:%d\", &tm);\n+\tstd::string tsStr(str);\n+\n+\tsetString(EXIF_IFD_GPS, static_cast(EXIF_TAG_GPS_DATE_STAMP),\n+\t\t EXIF_FORMAT_ASCII, tsStr);\n+\n+\t/* Set GPS_TIME_STAMP */\n+\tExifEntry *entry =\n+\t\tcreateEntry(EXIF_IFD_GPS,\n+\t\t\t static_cast(EXIF_TAG_GPS_TIME_STAMP),\n+\t\t\t EXIF_FORMAT_RATIONAL, 3, 3 * sizeof(ExifRational));\n+\tif (!entry)\n+\t\treturn;\n+\n+\tExifRational ts[] = {\n+\t\t{ static_cast(tm.tm_hour), 1 },\n+\t\t{ static_cast(tm.tm_min), 1 },\n+\t\t{ static_cast(tm.tm_sec), 1 },\n+\t};\n+\n+\tfor (int i = 0; i < 3; i++)\n+\t\texif_set_rational(entry->data + i * sizeof(ExifRational),\n+\t\t\t\t order_, ts[i]);\n+\n+\texif_entry_unref(entry);\n+}\n+\n+std::tuple Exif::degreesToDMS(double decimalDegrees)\n+{\n+\tint degrees = std::trunc(decimalDegrees);\n+\tdouble minutes = std::abs((decimalDegrees - degrees) * 60);\n+\tdouble seconds = (minutes - std::trunc(minutes)) * 60;\n+\n+\treturn { degrees, std::trunc(minutes), std::round(seconds) };\n+}\n+\n+void Exif::setGPSDMS(ExifIfd ifd, ExifTag tag, int deg, int min, int sec)\n+{\n+\tExifEntry *entry = createEntry(ifd, tag, EXIF_FORMAT_RATIONAL, 3,\n+\t\t\t\t 3 * sizeof(ExifRational));\n+\tif (!entry)\n+\t\treturn;\n+\n+\tExifRational coords[] = {\n+\t\t{ static_cast(deg), 1 },\n+\t\t{ static_cast(min), 1 },\n+\t\t{ static_cast(sec), 1 },\n+\t};\n+\n+\tfor (int i = 0; i < 3; i++)\n+\t\texif_set_rational(entry->data + i * sizeof(ExifRational),\n+\t\t\t\t order_, coords[i]);\n+\texif_entry_unref(entry);\n+}\n+\n+/*\n+ * \\brief Set GPS location (lat, long, alt)\n+ * \\param[in] coords Pointer to coordinates latitude, longitude, and altitude,\n+ * first two in degrees, the third in meters\n+ */\n+void Exif::setGPSLocation(const double *coords)\n+{\n+\tint deg, min, sec;\n+\n+\tstd::tie(deg, min, sec) = degreesToDMS(coords[0]);\n+\tsetString(EXIF_IFD_GPS, static_cast(EXIF_TAG_GPS_LATITUDE_REF),\n+\t\t EXIF_FORMAT_ASCII, deg >= 0 ? \"N\" : \"S\");\n+\tsetGPSDMS(EXIF_IFD_GPS, static_cast(EXIF_TAG_GPS_LATITUDE),\n+\t\t std::abs(deg), min, sec);\n+\n+\tstd::tie(deg, min, sec) = degreesToDMS(coords[1]);\n+\tsetString(EXIF_IFD_GPS, static_cast(EXIF_TAG_GPS_LONGITUDE_REF),\n+\t\t EXIF_FORMAT_ASCII, deg >= 0 ? \"E\" : \"W\");\n+\tsetGPSDMS(EXIF_IFD_GPS, static_cast(EXIF_TAG_GPS_LATITUDE),\n+\t\t std::abs(deg), min, sec);\n+\n+\tsetByte(EXIF_IFD_GPS, static_cast(EXIF_TAG_GPS_ALTITUDE_REF),\n+\t\tcoords[2] >= 0 ? 0 : 1);\n+\tsetRational(EXIF_IFD_GPS, static_cast(EXIF_TAG_GPS_ALTITUDE),\n+\t\t ExifRational{ static_cast(std::abs(coords[2])), 1 });\n+}\n+\n+void Exif::setGPSMethod(const std::string &method)\n+{\n+\tsetString(EXIF_IFD_GPS, static_cast(EXIF_TAG_GPS_PROCESSING_METHOD),\n+\t\t EXIF_FORMAT_UNDEFINED, method, Unicode);\n }\n \n void Exif::setOrientation(int orientation)\n@@ -334,6 +448,39 @@ void Exif::setThumbnail(Span thumbnail,\n \tsetShort(EXIF_IFD_0, EXIF_TAG_COMPRESSION, compression);\n }\n \n+void Exif::setFocalLength(float length)\n+{\n+\tExifRational rational = { static_cast(length * 1000), 1000 };\n+\tsetRational(EXIF_IFD_EXIF, EXIF_TAG_FOCAL_LENGTH, rational);\n+}\n+\n+void Exif::setExposureTime(uint64_t nsec)\n+{\n+\tExifRational rational = { static_cast(nsec), 1000000000 };\n+\tsetRational(EXIF_IFD_EXIF, EXIF_TAG_EXPOSURE_TIME, rational);\n+}\n+\n+void Exif::setAperture(float size)\n+{\n+\tExifRational rational = { static_cast(size * 10000), 10000 };\n+\tsetRational(EXIF_IFD_EXIF, EXIF_TAG_FNUMBER, rational);\n+}\n+\n+void Exif::setISO(uint16_t iso)\n+{\n+\tsetShort(EXIF_IFD_EXIF, EXIF_TAG_ISO_SPEED_RATINGS, iso);\n+}\n+\n+void Exif::setFlash(Flash flash)\n+{\n+\tsetShort(EXIF_IFD_EXIF, EXIF_TAG_FLASH, static_cast(flash));\n+}\n+\n+void Exif::setWhiteBalance(WhiteBalance wb)\n+{\n+\tsetShort(EXIF_IFD_EXIF, EXIF_TAG_WHITE_BALANCE, static_cast(wb));\n+}\n+\n /**\n * \\brief Convert UTF-8 string to UTF-16 string\n * \\param[in] str String to convert\ndiff --git a/src/android/jpeg/exif.h b/src/android/jpeg/exif.h\nindex 73f231b2..7d8727ad 100644\n--- a/src/android/jpeg/exif.h\n+++ b/src/android/jpeg/exif.h\n@@ -26,6 +26,27 @@ public:\n \t\tJPEG = 6,\n \t};\n \n+\tenum Flash {\n+\t\t/* bit 0 */\n+\t\tFired = 0x01,\n+\t\t/* bits 1 and 2 */\n+\t\tStrobeDetected = 0x04,\n+\t\tStrobeNotDetected = 0x06,\n+\t\t/* bits 3 and 4 */\n+\t\tModeCompulsoryFiring = 0x08,\n+\t\tModeCompulsorySuppression = 0x10,\n+\t\tModeAuto = 0x18,\n+\t\t/* bit 5 */\n+\t\tFlashNotPresent = 0x20,\n+\t\t/* bit 6 */\n+\t\tRedEye = 0x40,\n+\t};\n+\n+\tenum WhiteBalance {\n+\t\tAuto = 0,\n+\t\tManual = 1,\n+\t};\n+\n \tenum StringEncoding {\n \t\tNoEncoding = 0,\n \t\tASCII = 1,\n@@ -39,7 +60,18 @@ public:\n \tvoid setSize(const libcamera::Size &size);\n \tvoid setThumbnail(libcamera::Span thumbnail,\n \t\t\t Compression compression);\n-\tvoid setTimestamp(time_t timestamp);\n+\tvoid setTimestamp(time_t timestamp, uint64_t subsec);\n+\n+\tvoid setGPSDateTimestamp(time_t timestamp);\n+\tvoid setGPSLocation(const double *coords);\n+\tvoid setGPSMethod(const std::string &method);\n+\n+\tvoid setFocalLength(float length);\n+\tvoid setExposureTime(uint64_t nsec);\n+\tvoid setAperture(float size);\n+\tvoid setISO(uint16_t iso);\n+\tvoid setFlash(Flash flash);\n+\tvoid setWhiteBalance(WhiteBalance wb);\n \n \tlibcamera::Span data() const { return { exifData_, size_ }; }\n \t[[nodiscard]] int generate();\n@@ -49,12 +81,16 @@ private:\n \tExifEntry *createEntry(ExifIfd ifd, ExifTag tag, ExifFormat format,\n \t\t\t unsigned long components, unsigned int size);\n \n+\tvoid setByte(ExifIfd ifd, ExifTag tag, uint8_t item);\n \tvoid setShort(ExifIfd ifd, ExifTag tag, uint16_t item);\n \tvoid setLong(ExifIfd ifd, ExifTag tag, uint32_t item);\n \tvoid setString(ExifIfd ifd, ExifTag tag, ExifFormat format,\n \t\t const std::string &item, StringEncoding encoding = NoEncoding);\n \tvoid setRational(ExifIfd ifd, ExifTag tag, ExifRational item);\n \n+\tstd::tuple degreesToDMS(double decimalDegrees);\n+\tvoid setGPSDMS(ExifIfd ifd, ExifTag tag, int deg, int min, int sec);\n+\n \tstd::u16string utf8ToUtf16(const std::string &str);\n \n \tbool valid_;\n","prefixes":["libcamera-devel","v3","3/8"]}