{"id":10913,"url":"https://patchwork.libcamera.org/api/1.1/patches/10913/?format=json","web_url":"https://patchwork.libcamera.org/patch/10913/","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":"<20210121101549.134574-2-paul.elder@ideasonboard.com>","date":"2021-01-21T10:15:41","name":"[libcamera-devel,v2,1/9] android: jpeg: exif: Expand setString to support different encodings","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"4c851081618857231dbb3fff226a750c0c9891ab","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/10913/mbox/","series":[{"id":1590,"url":"https://patchwork.libcamera.org/api/1.1/series/1590/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=1590","date":"2021-01-21T10:15:40","name":"Fill in android result metadata and EXIF tags","version":2,"mbox":"https://patchwork.libcamera.org/series/1590/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/10913/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/10913/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 452B5C0F2A\n\tfor ;\n\tThu, 21 Jan 2021 10:16:05 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 12594681DB;\n\tThu, 21 Jan 2021 11:16:05 +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 C5C23681A0\n\tfor ;\n\tThu, 21 Jan 2021 11:16:03 +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 3C57550E;\n\tThu, 21 Jan 2021 11:16:01 +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=\"X1OKmaqk\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1611224163;\n\tbh=VVKWPshAHlzwGDCJA+HhMPLk7FTlPwYWPVztdK4UFIc=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=X1OKmaqkVA7fMGW260A/0135OrAq9AsHenW6/JiAnb308j+qc6STuWg8zZiQEEuVF\n\twCvvqOQVI4+5W/B22+n0PZWWUKqp9kSn581/n6oPQ4Oz54jZ8IQQo+qXs/LNpVPDML\n\tFMar7BsKlkzv+BwKAhzF7aPshTJpJ5fo5Lhguq1g=","From":"Paul Elder ","To":"libcamera-devel@lists.libcamera.org","Date":"Thu, 21 Jan 2021 19:15:41 +0900","Message-Id":"<20210121101549.134574-2-paul.elder@ideasonboard.com>","X-Mailer":"git-send-email 2.27.0","In-Reply-To":"<20210121101549.134574-1-paul.elder@ideasonboard.com>","References":"<20210121101549.134574-1-paul.elder@ideasonboard.com>","MIME-Version":"1.0","Subject":"[libcamera-devel] [PATCH v2 1/9] android: jpeg: exif: Expand\n\tsetString to support different encodings","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":"GPSProcessingMethod and UserComment in EXIF tags can be in UTF-16.\nExpand setString to take an encoding when the field type is undefined.\nUpdate callers accordingly.\n\nSigned-off-by: Paul Elder \n\n---\nChanges in v2:\n- moved from utils into exif\n- support no-encoding\n---\n src/android/jpeg/exif.cpp | 107 +++++++++++++++++++++++++++++++-------\n src/android/jpeg/exif.h | 12 ++++-\n 2 files changed, 99 insertions(+), 20 deletions(-)","diff":"diff --git a/src/android/jpeg/exif.cpp b/src/android/jpeg/exif.cpp\nindex 33b3fa7f..cff366a4 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 \n+#include \n+\n #include \"libcamera/internal/log.h\"\n #include \"libcamera/internal/utils.h\"\n \n@@ -64,7 +67,7 @@ Exif::Exif()\n \texif_data_set_byte_order(data_, order_);\n \n \tsetString(EXIF_IFD_EXIF, EXIF_TAG_EXIF_VERSION,\n-\t\t EXIF_FORMAT_UNDEFINED, \"0231\");\n+\t\t EXIF_FORMAT_UNDEFINED, NoEncoding, \"0231\");\n \n \t/* Create the mandatory EXIF fields with default data. */\n \texif_data_fix(data_);\n@@ -178,10 +181,18 @@ void Exif::setRational(ExifIfd ifd, ExifTag tag, ExifRational item)\n \texif_entry_unref(entry);\n }\n \n-void Exif::setString(ExifIfd ifd, ExifTag tag, ExifFormat format, const std::string &item)\n+static const std::map> StringEncodingCodes = {\n+\t{ Exif::ASCII, { 0x41, 0x53, 0x43, 0x49, 0x49, 0x00, 0x00, 0x00 } },\n+\t{ Exif::JIS, { 0x4a, 0x49, 0x53, 0x00, 0x00, 0x00, 0x00, 0x00 } },\n+\t{ Exif::Unicode, { 0x55, 0x4e, 0x49, 0x43, 0x4f, 0x44, 0x45, 0x00 } },\n+\t{ Exif::Undefined, { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 } },\n+};\n+\n+void Exif::setString(ExifIfd ifd, ExifTag tag, ExifFormat format,\n+\t\t StringEncoding enc, const std::string &item)\n {\n \tstd::string ascii;\n-\tsize_t length;\n+\tsize_t length = 0;\n \tconst char *str;\n \n \tif (format == EXIF_FORMAT_ASCII) {\n@@ -190,14 +201,44 @@ void Exif::setString(ExifIfd ifd, ExifTag tag, ExifFormat format, const std::str\n \n \t\t/* Pad 1 extra byte to null-terminate the ASCII string. */\n \t\tlength = ascii.length() + 1;\n-\t} else {\n-\t\tstr = item.c_str();\n-\n-\t\t/*\n-\t\t * Strings stored in different formats (EXIF_FORMAT_UNDEFINED)\n-\t\t * are not null-terminated.\n-\t\t */\n-\t\tlength = item.length();\n+\t} else if (format == EXIF_FORMAT_UNDEFINED) {\n+\t\tstd::vector buf;\n+\t\tconst std::vector &constbuf = buf;\n+\t\tstd::u16string u16str;\n+\n+\t\tswitch (enc) {\n+\t\tcase Unicode:\n+\t\t\tbuf = StringEncodingCodes.find(enc)->second;\n+\t\t\tu16str = utf8ToUtf16(item);\n+\n+\t\t\t/* Little-endian */\n+\t\t\tbuf.resize(8 + u16str.size() * 2);\n+\t\t\tfor (size_t i = 0; i < u16str.size(); i++) {\n+\t\t\t\tbuf[8 + 2 * i] = (u16str[i] & 0xff);\n+\t\t\t\tbuf[8 + 2 * i + 1] = ((u16str[i] >> 8) & 0xff);\n+\t\t\t}\n+\n+\t\t\tstr = reinterpret_cast(constbuf.data());\n+\t\t\tlength = buf.size();\n+\n+\t\t\tbreak;\n+\t\t/* \\todo Support JIS */\n+\t\tcase JIS:\n+\t\tcase ASCII:\n+\t\tcase Undefined:\n+\t\t\tbuf = StringEncodingCodes.find(enc)->second;\n+\t\t\t[[fallthrough]];\n+\t\tdefault:\n+\t\t\tbuf.insert(buf.end(), item.begin(), item.end());\n+\t\t\tstr = reinterpret_cast(constbuf.data());\n+\n+\t\t\t/*\n+\t\t\t * Strings stored in different formats (EXIF_FORMAT_UNDEFINED)\n+\t\t\t * are not null-terminated.\n+\t\t\t */\n+\t\t\tlength = buf.size();\n+\t\t\tbreak;\n+\t\t}\n \t}\n \n \tExifEntry *entry = createEntry(ifd, tag, format, length, length);\n@@ -210,12 +251,12 @@ void Exif::setString(ExifIfd ifd, ExifTag tag, ExifFormat format, const std::str\n \n void Exif::setMake(const std::string &make)\n {\n-\tsetString(EXIF_IFD_0, EXIF_TAG_MAKE, EXIF_FORMAT_ASCII, make);\n+\tsetString(EXIF_IFD_0, EXIF_TAG_MAKE, EXIF_FORMAT_ASCII, NoEncoding, make);\n }\n \n void Exif::setModel(const std::string &model)\n {\n-\tsetString(EXIF_IFD_0, EXIF_TAG_MODEL, EXIF_FORMAT_ASCII, model);\n+\tsetString(EXIF_IFD_0, EXIF_TAG_MODEL, EXIF_FORMAT_ASCII, NoEncoding, model);\n }\n \n void Exif::setSize(const Size &size)\n@@ -233,9 +274,9 @@ void Exif::setTimestamp(time_t timestamp)\n \tstrftime(str, sizeof(str), \"%Y:%m:%d %H:%M:%S\", &tm);\n \tstd::string ts(str);\n \n-\tsetString(EXIF_IFD_0, EXIF_TAG_DATE_TIME, EXIF_FORMAT_ASCII, ts);\n-\tsetString(EXIF_IFD_EXIF, EXIF_TAG_DATE_TIME_ORIGINAL, EXIF_FORMAT_ASCII, ts);\n-\tsetString(EXIF_IFD_EXIF, EXIF_TAG_DATE_TIME_DIGITIZED, EXIF_FORMAT_ASCII, ts);\n+\tsetString(EXIF_IFD_0, EXIF_TAG_DATE_TIME, EXIF_FORMAT_ASCII, NoEncoding, ts);\n+\tsetString(EXIF_IFD_EXIF, EXIF_TAG_DATE_TIME_ORIGINAL, EXIF_FORMAT_ASCII, NoEncoding, ts);\n+\tsetString(EXIF_IFD_EXIF, EXIF_TAG_DATE_TIME_DIGITIZED, EXIF_FORMAT_ASCII, NoEncoding, ts);\n \n \t/* Query and set timezone information if available. */\n \tint r = strftime(str, sizeof(str), \"%z\", &tm);\n@@ -244,13 +285,13 @@ void Exif::setTimestamp(time_t timestamp)\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\t\t EXIF_FORMAT_ASCII, NoEncoding, 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\t\t EXIF_FORMAT_ASCII, NoEncoding, 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\t\t EXIF_FORMAT_ASCII, NoEncoding, tz);\n \t}\n }\n \n@@ -290,6 +331,34 @@ void Exif::setThumbnail(Span thumbnail,\n \tsetShort(EXIF_IFD_0, EXIF_TAG_COMPRESSION, compression);\n }\n \n+/**\n+ * \\brief Convert UTF-8 string to UTF-16 string\n+ * \\param[in] str String to convert\n+ *\n+ * \\return \\a str in UTF-16\n+ */\n+std::u16string Exif::utf8ToUtf16(const std::string &str)\n+{\n+\tstd::mbstate_t state{};\n+\tchar16_t c16;\n+\tconst char *ptr = str.data();\n+\tconst char *end = ptr + str.size();\n+\n+\tstd::u16string ret;\n+\twhile (size_t rc = mbrtoc16(&c16, ptr, end - ptr + 1, &state)) {\n+\t\tif (rc == static_cast(-2) ||\n+\t\t rc == static_cast(-1))\n+\t\t\tbreak;\n+\n+\t\tret.push_back(c16);\n+\n+\t\tif (rc > 0)\n+\t\t\tptr += rc;\n+\t}\n+\n+\treturn ret;\n+}\n+\n [[nodiscard]] int Exif::generate()\n {\n \tif (exifData_) {\ndiff --git a/src/android/jpeg/exif.h b/src/android/jpeg/exif.h\nindex 5cab4559..db98ba63 100644\n--- a/src/android/jpeg/exif.h\n+++ b/src/android/jpeg/exif.h\n@@ -26,6 +26,14 @@ public:\n \t\tJPEG = 6,\n \t};\n \n+\tenum StringEncoding {\n+\t\tNoEncoding = 0,\n+\t\tASCII = 1,\n+\t\tJIS = 2,\n+\t\tUnicode = 3,\n+\t\tUndefined = 4,\n+\t};\n+\n \tvoid setMake(const std::string &make);\n \tvoid setModel(const std::string &model);\n \n@@ -46,9 +54,11 @@ private:\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+\t\t StringEncoding enc, const std::string &item);\n \tvoid setRational(ExifIfd ifd, ExifTag tag, ExifRational item);\n \n+\tstd::u16string utf8ToUtf16(const std::string &str);\n+\n \tbool valid_;\n \n \tExifData *data_;\n","prefixes":["libcamera-devel","v2","1/9"]}