Patch Detail
Show a patch.
GET /api/1.1/patches/10860/?format=api
{ "id": 10860, "url": "https://patchwork.libcamera.org/api/1.1/patches/10860/?format=api", "web_url": "https://patchwork.libcamera.org/patch/10860/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/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": "<20210114104035.302968-5-paul.elder@ideasonboard.com>", "date": "2021-01-14T10:40:33", "name": "[libcamera-devel,4/6] android: jpeg: exif: Add functions for setting various values", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "4f7b892a1f14f36c8a7fee30a259ad8a3baa1e34", "submitter": { "id": 17, "url": "https://patchwork.libcamera.org/api/1.1/people/17/?format=api", "name": "Paul Elder", "email": "paul.elder@ideasonboard.com" }, "delegate": { "id": 17, "url": "https://patchwork.libcamera.org/api/1.1/users/17/?format=api", "username": "epaul", "first_name": "Paul", "last_name": "Elder", "email": "paul.elder@ideasonboard.com" }, "mbox": "https://patchwork.libcamera.org/patch/10860/mbox/", "series": [ { "id": 1577, "url": "https://patchwork.libcamera.org/api/1.1/series/1577/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=1577", "date": "2021-01-14T10:40:29", "name": "Fill in android result metadata and EXIF tags", "version": 1, "mbox": "https://patchwork.libcamera.org/series/1577/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/10860/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/10860/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 B7989BD808\n\tfor <parsemail@patchwork.libcamera.org>;\n\tThu, 14 Jan 2021 10:40:55 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 6F96F680F4;\n\tThu, 14 Jan 2021 11:40:55 +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 BB9EC680E2\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tThu, 14 Jan 2021 11:40:54 +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 567278D7;\n\tThu, 14 Jan 2021 11:40:53 +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=\"HlriAdxZ\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1610620854;\n\tbh=zrWLaVR7re63TKBxBOmUkX/284VL9iPXlvYRcV0Iv0M=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=HlriAdxZLgpNnkc9VAMSKtO+TMNpsqXIAITkDWdl1enwrlUyhF7/jRAn8dG/XIH0n\n\toyPLLh0b/p/hqzm8gxoLcwiaFZsK0F8rc0T64a4ayfTnIa31umknnBuGubT7xYCmMG\n\tfkWQJs5ua65mhcb8rzOSCZoTbBvL+TF3YMGW/W2k=", "From": "Paul Elder <paul.elder@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Thu, 14 Jan 2021 19:40:33 +0900", "Message-Id": "<20210114104035.302968-5-paul.elder@ideasonboard.com>", "X-Mailer": "git-send-email 2.27.0", "In-Reply-To": "<20210114104035.302968-1-paul.elder@ideasonboard.com>", "References": "<20210114104035.302968-1-paul.elder@ideasonboard.com>", "MIME-Version": "1.0", "Subject": "[libcamera-devel] [PATCH 4/6] 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>\n---\n src/android/jpeg/exif.cpp | 187 ++++++++++++++++++++++++++++++++++++++\n src/android/jpeg/exif.h | 41 +++++++++\n 2 files changed, 228 insertions(+)", "diff": "diff --git a/src/android/jpeg/exif.cpp b/src/android/jpeg/exif.cpp\nindex b19cb4cd..fde07a63 100644\n--- a/src/android/jpeg/exif.cpp\n+++ b/src/android/jpeg/exif.cpp\n@@ -7,6 +7,9 @@\n \n #include \"exif.h\"\n \n+#include <cmath>\n+#include <tuple>\n+\n #include \"libcamera/internal/log.h\"\n #include \"libcamera/internal/utils.h\"\n \n@@ -148,6 +151,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+\tmemcpy(entry->data, &item, 1);\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@@ -178,6 +191,22 @@ void Exif::setRational(ExifIfd ifd, ExifTag tag, ExifRational item)\n \texif_entry_unref(entry);\n }\n \n+/*\n+ * \\brief setArray\n+ * \\param[in] size sizeof(data[0])\n+ * \\param[in] count Number of elements in data\n+ */\n+void Exif::setArray(ExifIfd ifd, ExifTag tag, ExifFormat format,\n+\t\t const void *data, size_t size, size_t count)\n+{\n+\tExifEntry *entry = createEntry(ifd, tag, format, count, size * count);\n+\tif (!entry)\n+\t\treturn;\n+\n+\tmemcpy(entry->data, data, size * count);\n+\texif_entry_unref(entry);\n+}\n+\n void Exif::setString(ExifIfd ifd, ExifTag tag, ExifFormat format, const std::string &item)\n {\n \tstd::string ascii;\n@@ -254,6 +283,111 @@ void Exif::setTimestamp(time_t timestamp)\n \t}\n }\n \n+void Exif::setGPSTimestamp(ExifIfd ifd, ExifTag tag, const struct tm &tm)\n+{\n+\tsize_t length = 3 * sizeof(ExifRational);\n+\n+\tExifEntry *entry = createEntry(ifd, tag, EXIF_FORMAT_RATIONAL, 3, length);\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+\tmemcpy(entry->data, ts, length);\n+\texif_entry_unref(entry);\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 ts(str);\n+\n+\tsetGPSTimestamp(EXIF_IFD_GPS, static_cast<ExifTag>(EXIF_TAG_GPS_TIME_STAMP), tm);\n+\tsetString(EXIF_IFD_GPS, static_cast<ExifTag>(EXIF_TAG_GPS_DATE_STAMP), EXIF_FORMAT_ASCII, ts);\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+\tsize_t length = 3 * sizeof(ExifRational);\n+\n+\tExifEntry *entry = createEntry(ifd, tag, EXIF_FORMAT_RATIONAL, 3, length);\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+\tmemcpy(entry->data, coords, length);\n+\texif_entry_unref(entry);\n+}\n+\n+/*\n+ * \\brief Set GPS location (lat, long, alt) from Android JPEG GPS coordinates\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 latDeg, latMin, latSec, longDeg, longMin, longSec;\n+\n+\tstd::tie<int, int, int>(latDeg, latMin, latSec) = degreesToDMS(coords[0]);\n+\tsetString(EXIF_IFD_GPS, static_cast<ExifTag>(EXIF_TAG_GPS_LATITUDE_REF),\n+\t\t EXIF_FORMAT_ASCII, latDeg >= 0 ? \"N\" : \"S\");\n+\tsetGPSDMS(EXIF_IFD_GPS, static_cast<ExifTag>(EXIF_TAG_GPS_LATITUDE),\n+\t\t std::abs(latDeg), latMin, latSec);\n+\n+\tstd::tie<int, int, int>(longDeg, longMin, longSec) = degreesToDMS(coords[1]);\n+\tsetString(EXIF_IFD_GPS, static_cast<ExifTag>(EXIF_TAG_GPS_LONGITUDE_REF),\n+\t\t EXIF_FORMAT_ASCII, longDeg >= 0 ? \"E\" : \"W\");\n+\tsetGPSDMS(EXIF_IFD_GPS, static_cast<ExifTag>(EXIF_TAG_GPS_LATITUDE),\n+\t\t std::abs(longDeg), longMin, longSec);\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+\tstd::vector<uint8_t> buf = libcamera::utils::string_to_c16(method, true);\n+\t/* Designate that this string is Unicode (UCS-2) */\n+\tbuf.insert(buf.begin(), { 0x55, 0x4E, 0x49, 0x43, 0x4F, 0x44, 0x45, 0x00 });\n+\n+\t/* 8 bytes for character code designation, plus 32 bytes from android */\n+\tunsigned int nullTerm = 39;\n+\tfor (int i = 8; i < buf.size(); i++) {\n+\t\tif (!buf[i]) {\n+\t\t\tnullTerm = i;\n+\t\t\tbreak;\n+\t\t}\n+\t}\n+\tbuf.resize(nullTerm);\n+\n+\tsetArray(EXIF_IFD_GPS, static_cast<ExifTag>(EXIF_TAG_GPS_PROCESSING_METHOD),\n+\t\t EXIF_FORMAT_UNDEFINED, buf.data(), 1, buf.size());\n+}\n+\n void Exif::setOrientation(int orientation)\n {\n \tint value;\n@@ -288,6 +422,59 @@ void Exif::setThumbnail(Span<const unsigned char> thumbnail,\n \tdata_->size = thumbnail.size();\n \n \tsetShort(EXIF_IFD_0, EXIF_TAG_COMPRESSION, compression);\n+\tsetLong(EXIF_IFD_0, EXIF_TAG_JPEG_INTERCHANGE_FORMAT, 0);\n+\tsetLong(EXIF_IFD_0, EXIF_TAG_JPEG_INTERCHANGE_FORMAT_LENGTH, data_->size);\n+}\n+\n+void Exif::setFocalLength(float length)\n+{\n+\tExifRational rational = { static_cast<ExifLong>(length), 1 };\n+\tsetRational(EXIF_IFD_EXIF, EXIF_TAG_FOCAL_LENGTH, rational);\n+}\n+\n+void Exif::setExposureTime(int64_t sec)\n+{\n+\tExifRational rational = { static_cast<ExifLong>(sec), 1 };\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(int16_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+void Exif::setSubsecTime(uint64_t subsec)\n+{\n+\tsetString(EXIF_IFD_EXIF, EXIF_TAG_SUB_SEC_TIME,\n+\t\t EXIF_FORMAT_ASCII, std::to_string(subsec));\n+}\n+\n+void Exif::setSubsecTimeOriginal(uint64_t subsec)\n+{\n+\tsetString(EXIF_IFD_EXIF, EXIF_TAG_SUB_SEC_TIME_ORIGINAL,\n+\t\t EXIF_FORMAT_ASCII, std::to_string(subsec));\n+}\n+\n+void Exif::setSubsecTimeDigitized(uint64_t subsec)\n+{\n+\tsetString(EXIF_IFD_EXIF, EXIF_TAG_SUB_SEC_TIME_DIGITIZED,\n+\t\t EXIF_FORMAT_ASCII, std::to_string(subsec));\n }\n \n [[nodiscard]] int Exif::generate()\ndiff --git a/src/android/jpeg/exif.h b/src/android/jpeg/exif.h\nindex 5cab4559..cd3b78cd 100644\n--- a/src/android/jpeg/exif.h\n+++ b/src/android/jpeg/exif.h\n@@ -26,6 +26,28 @@ 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\tStrobeReserved = 0x02,\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 \tvoid setMake(const std::string &make);\n \tvoid setModel(const std::string &model);\n \n@@ -35,6 +57,19 @@ public:\n \t\t\t Compression compression);\n \tvoid setTimestamp(time_t timestamp);\n \n+\tvoid setGPSDateTimestamp(time_t timestamp);\n+\tvoid setGPSLocation(const double *coords);\n+\tvoid setGPSMethod(const std::string &method);\n+\tvoid setFocalLength(float length);\n+\tvoid setExposureTime(int64_t sec);\n+\tvoid setAperture(float size);\n+\tvoid setISO(int16_t iso);\n+\tvoid setFlash(Flash flash);\n+\tvoid setWhiteBalance(WhiteBalance wb);\n+\tvoid setSubsecTime(uint64_t subsec);\n+\tvoid setSubsecTimeOriginal(uint64_t subsec);\n+\tvoid setSubsecTimeDigitized(uint64_t subsec);\n+\n \tlibcamera::Span<const uint8_t> data() const { return { exifData_, size_ }; }\n \t[[nodiscard]] int generate();\n \n@@ -43,11 +78,17 @@ private:\n \tExifEntry *createEntry(ExifIfd ifd, ExifTag tag, ExifFormat format,\n \t\t\t unsigned long components, unsigned int size);\n \n+\tvoid setArray(ExifIfd ifd, ExifTag tag, ExifFormat format,\n+\t\t const void *data, size_t size, size_t count);\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);\n \tvoid setRational(ExifIfd ifd, ExifTag tag, ExifRational item);\n+\tvoid setGPSTimestamp(ExifIfd ifd, ExifTag tag, const struct tm &tm);\n+\tstd::tuple<int, int, int> degreesToDMS(double decimalDegrees);\n+\tvoid setGPSDMS(ExifIfd ifd, ExifTag tag, int deg, int min, int sec);\n \n \tbool valid_;\n \n", "prefixes": [ "libcamera-devel", "4/6" ] }