Patch Detail
Show a patch.
GET /api/patches/10999/?format=api
{ "id": 10999, "url": "https://patchwork.libcamera.org/api/patches/10999/?format=api", "web_url": "https://patchwork.libcamera.org/patch/10999/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20210126102825.147026-4-paul.elder@ideasonboard.com>", "date": "2021-01-26T10:28:20", "name": "[libcamera-devel,v5,3/8] android: jpeg: exif: Add functions for setting various values", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "d302ba5112e9f779126399b93af6eddd35b9aa59", "submitter": { "id": 17, "url": "https://patchwork.libcamera.org/api/people/17/?format=api", "name": "Paul Elder", "email": "paul.elder@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/10999/mbox/", "series": [ { "id": 1608, "url": "https://patchwork.libcamera.org/api/series/1608/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=1608", "date": "2021-01-26T10:28:17", "name": "Fill in android result metadata and EXIF tags", "version": 5, "mbox": "https://patchwork.libcamera.org/series/1608/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/10999/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/10999/checks/", "tags": {}, "headers": { "Return-Path": "<libcamera-devel-bounces@lists.libcamera.org>", "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 8B1E5BD808\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 26 Jan 2021 10:28:44 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 587E7682FB;\n\tTue, 26 Jan 2021 11:28:44 +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 C108A682F0\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 26 Jan 2021 11:28:42 +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 AC5742E0;\n\tTue, 26 Jan 2021 11:28:40 +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=\"fvrujwUb\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1611656922;\n\tbh=J98Y0NhMppw7SGy2VKfxV8NrkXY3l77xqrrpRw7/Bdc=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=fvrujwUbQrBt+hrGmT3sZmJig3f0NR/nxR8LH5H4FfLJ6nvKB++4pwlWTzQQd/GXw\n\t5SCKBCUiM9QWVspf3pJg1q2QfUAdNCDBedppDF16prvVkeJ4SIziHYoYSBn/4m4nfn\n\tuaYODA0/0KEx8lWNvS/ZW/QsMPk9R7gjoFfapVa4=", "From": "Paul Elder <paul.elder@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Tue, 26 Jan 2021 19:28:20 +0900", "Message-Id": "<20210126102825.147026-4-paul.elder@ideasonboard.com>", "X-Mailer": "git-send-email 2.27.0", "In-Reply-To": "<20210126102825.147026-1-paul.elder@ideasonboard.com>", "References": "<20210126102825.147026-1-paul.elder@ideasonboard.com>", "MIME-Version": "1.0", "Subject": "[libcamera-devel] [PATCH v5 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": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "Content-Type": "text/plain; charset=\"us-ascii\"", "Content-Transfer-Encoding": "7bit", "Errors-To": "libcamera-devel-bounces@lists.libcamera.org", "Sender": "\"libcamera-devel\" <libcamera-devel-bounces@lists.libcamera.org>" }, "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 <paul.elder@ideasonboard.com>\nReviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>\nReviewed-by: Jacopo Mondi <jacopo@jmondi.org>\n\n---\nChanges in v5:\n- fix number alignment in string in setting subsec values\n- use ms operator from chrono for setting timestamp subsec\n- other cosmetic changes\n\nChanges in v4:\n- change type of subsec to std::chrono::milliseconds\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 | 181 +++++++++++++++++++++--\n src/android/jpeg/exif.h | 39 ++++-\n src/android/jpeg/post_processor_jpeg.cpp | 5 +-\n 3 files changed, 209 insertions(+), 16 deletions(-)", "diff": "diff --git a/src/android/jpeg/exif.cpp b/src/android/jpeg/exif.cpp\nindex 204a237a..b4b3c0b7 100644\n--- a/src/android/jpeg/exif.cpp\n+++ b/src/android/jpeg/exif.cpp\n@@ -7,7 +7,11 @@\n \n #include \"exif.h\"\n \n+#include <cmath>\n+#include <iomanip>\n #include <map>\n+#include <sstream>\n+#include <tuple>\n #include <uchar.h>\n \n #include \"libcamera/internal/log.h\"\n@@ -151,6 +155,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@@ -267,7 +281,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, std::chrono::milliseconds msec)\n {\n \tstruct tm tm;\n \tlocaltime_r(×tamp, &tm);\n@@ -282,19 +296,125 @@ 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>(_ExifTag::OFFSET_TIME),\n-\t\t\t EXIF_FORMAT_ASCII, tz);\n-\t\tsetString(EXIF_IFD_EXIF,\n-\t\t\t static_cast<ExifTag>(_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>(_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>(_ExifTag::OFFSET_TIME),\n+\t\t EXIF_FORMAT_ASCII, tz);\n+\tsetString(EXIF_IFD_EXIF,\n+\t\t static_cast<ExifTag>(_ExifTag::OFFSET_TIME_ORIGINAL),\n+\t\t EXIF_FORMAT_ASCII, tz);\n+\tsetString(EXIF_IFD_EXIF,\n+\t\t static_cast<ExifTag>(_ExifTag::OFFSET_TIME_DIGITIZED),\n+\t\t EXIF_FORMAT_ASCII, tz);\n+\n+\tstd::stringstream subsec;\n+\tsubsec << std::setfill('0') << std::setw(3) << std::to_string(msec.count());\n+\n+\tsetString(EXIF_IFD_EXIF, EXIF_TAG_SUB_SEC_TIME,\n+\t\t EXIF_FORMAT_ASCII, subsec.str());\n+\tsetString(EXIF_IFD_EXIF, EXIF_TAG_SUB_SEC_TIME_ORIGINAL,\n+\t\t EXIF_FORMAT_ASCII, subsec.str());\n+\tsetString(EXIF_IFD_EXIF, EXIF_TAG_SUB_SEC_TIME_DIGITIZED,\n+\t\t EXIF_FORMAT_ASCII, subsec.str());\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<ExifTag>(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<ExifTag>(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<ExifLong>(tm.tm_hour), 1 },\n+\t\t{ static_cast<ExifLong>(tm.tm_min), 1 },\n+\t\t{ static_cast<ExifLong>(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<int, int, int> 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<ExifLong>(deg), 1 },\n+\t\t{ static_cast<ExifLong>(min), 1 },\n+\t\t{ static_cast<ExifLong>(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+\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<int, int, int>(deg, min, sec) = degreesToDMS(coords[0]);\n+\tsetString(EXIF_IFD_GPS, static_cast<ExifTag>(EXIF_TAG_GPS_LATITUDE_REF),\n+\t\t EXIF_FORMAT_ASCII, deg >= 0 ? \"N\" : \"S\");\n+\tsetGPSDMS(EXIF_IFD_GPS, static_cast<ExifTag>(EXIF_TAG_GPS_LATITUDE),\n+\t\t std::abs(deg), min, sec);\n+\n+\tstd::tie<int, int, int>(deg, min, sec) = degreesToDMS(coords[1]);\n+\tsetString(EXIF_IFD_GPS, static_cast<ExifTag>(EXIF_TAG_GPS_LONGITUDE_REF),\n+\t\t EXIF_FORMAT_ASCII, deg >= 0 ? \"E\" : \"W\");\n+\tsetGPSDMS(EXIF_IFD_GPS, static_cast<ExifTag>(EXIF_TAG_GPS_LATITUDE),\n+\t\t std::abs(deg), min, sec);\n+\n+\tsetByte(EXIF_IFD_GPS, static_cast<ExifTag>(EXIF_TAG_GPS_ALTITUDE_REF),\n+\t\tcoords[2] >= 0 ? 0 : 1);\n+\tsetRational(EXIF_IFD_GPS, static_cast<ExifTag>(EXIF_TAG_GPS_ALTITUDE),\n+\t\t ExifRational{ static_cast<ExifLong>(std::abs(coords[2])), 1 });\n+}\n+\n+void Exif::setGPSMethod(const std::string &method)\n+{\n+\tsetString(EXIF_IFD_GPS, static_cast<ExifTag>(EXIF_TAG_GPS_PROCESSING_METHOD),\n+\t\t EXIF_FORMAT_UNDEFINED, method, Unicode);\n }\n \n void Exif::setOrientation(int orientation)\n@@ -333,6 +453,39 @@ void Exif::setThumbnail(Span<const unsigned char> thumbnail,\n \tsetShort(EXIF_IFD_0, EXIF_TAG_COMPRESSION, compression);\n }\n \n+void Exif::setFocalLength(float length)\n+{\n+\tExifRational rational = { static_cast<ExifLong>(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<ExifLong>(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<ExifLong>(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<ExifShort>(flash));\n+}\n+\n+void Exif::setWhiteBalance(WhiteBalance wb)\n+{\n+\tsetShort(EXIF_IFD_EXIF, EXIF_TAG_WHITE_BALANCE, static_cast<ExifShort>(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 8b84165b..b0d61402 100644\n--- a/src/android/jpeg/exif.h\n+++ b/src/android/jpeg/exif.h\n@@ -7,6 +7,7 @@\n #ifndef __ANDROID_JPEG_EXIF_H__\n #define __ANDROID_JPEG_EXIF_H__\n \n+#include <chrono>\n #include <string>\n #include <time.h>\n \n@@ -26,6 +27,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 +61,18 @@ public:\n \tvoid setSize(const libcamera::Size &size);\n \tvoid setThumbnail(libcamera::Span<const unsigned char> thumbnail,\n \t\t\t Compression compression);\n-\tvoid setTimestamp(time_t timestamp);\n+\tvoid setTimestamp(time_t timestamp, std::chrono::milliseconds msec);\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<const uint8_t> data() const { return { exifData_, size_ }; }\n \t[[nodiscard]] int generate();\n@@ -49,6 +82,7 @@ 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@@ -56,6 +90,9 @@ private:\n \t\t StringEncoding encoding = NoEncoding);\n \tvoid setRational(ExifIfd ifd, ExifTag tag, ExifRational item);\n \n+\tstd::tuple<int, int, int> 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_;\ndiff --git a/src/android/jpeg/post_processor_jpeg.cpp b/src/android/jpeg/post_processor_jpeg.cpp\nindex 436a50f8..aa0f783d 100644\n--- a/src/android/jpeg/post_processor_jpeg.cpp\n+++ b/src/android/jpeg/post_processor_jpeg.cpp\n@@ -7,6 +7,8 @@\n \n #include \"post_processor_jpeg.h\"\n \n+#include <chrono>\n+\n #include \"../camera_device.h\"\n #include \"../camera_metadata.h\"\n #include \"encoder_libjpeg.h\"\n@@ -17,6 +19,7 @@\n #include \"libcamera/internal/log.h\"\n \n using namespace libcamera;\n+using namespace std::chrono_literals;\n \n LOG_DEFINE_CATEGORY(JPEG)\n \n@@ -97,7 +100,7 @@ int PostProcessorJpeg::process(const FrameBuffer &source,\n \t * Since the precision we need for EXIF timestamp is only one\n \t * second, it is good enough.\n \t */\n-\texif.setTimestamp(std::time(nullptr));\n+\texif.setTimestamp(std::time(nullptr), 0ms);\n \n \tstd::vector<unsigned char> thumbnail;\n \tgenerateThumbnail(source, &thumbnail);\n", "prefixes": [ "libcamera-devel", "v5", "3/8" ] }