{"id":10966,"url":"https://patchwork.libcamera.org/api/patches/10966/?format=json","web_url":"https://patchwork.libcamera.org/patch/10966/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/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-2-paul.elder@ideasonboard.com>","date":"2021-01-23T05:16:57","name":"[libcamera-devel,v3,1/8] android: jpeg: exif: Expand setString to support different encodings","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"75e492fda8212296045be7bec9e4adea6445b575","submitter":{"id":17,"url":"https://patchwork.libcamera.org/api/people/17/?format=json","name":"Paul Elder","email":"paul.elder@ideasonboard.com"},"delegate":{"id":17,"url":"https://patchwork.libcamera.org/api/users/17/?format=json","username":"epaul","first_name":"Paul","last_name":"Elder","email":"paul.elder@ideasonboard.com"},"mbox":"https://patchwork.libcamera.org/patch/10966/mbox/","series":[{"id":1601,"url":"https://patchwork.libcamera.org/api/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/10966/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/10966/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 3B5D5C0F2B\n\tfor ;\n\tSat, 23 Jan 2021 05:17:18 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 0740968261;\n\tSat, 23 Jan 2021 06:17:18 +0100 (CET)","from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[213.167.242.64])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 19AE368261\n\tfor ;\n\tSat, 23 Jan 2021 06:17:16 +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 64B64813;\n\tSat, 23 Jan 2021 06:17:14 +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=\"dj9up+Cx\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1611379035;\n\tbh=9WkXGyOtEF2dbo92v7IcbVD/EwSZEIh7QEoB2XMX8Dc=;\n\th=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n\tb=dj9up+Cx4nyvKIZ4LtWBYj3yLxrI+VwZMMfEggYFwyLVPHzORL//mqSsccWyaFh8E\n\t5F9Bd4iblpgGSyeTHOYaIO9W54JvQerzfjdwPMEaZD+n7rOBfXbFOzLIJ8rwPqcean\n\tyayZvkJfrZ2mxaRSeUcgxLrKpFHeS5RlquNeUjeA=","From":"Paul Elder ","To":"libcamera-devel@lists.libcamera.org","Date":"Sat, 23 Jan 2021 14:16:57 +0900","Message-Id":"<20210123051704.188117-2-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 1/8] 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 v3:\n- use array to contain string encoding codes\n- drop JIS and Undefined\n- clean up setString a bit\n- use the endianness of the exif\n\nChanges in v2:\n- moved from utils into exif\n- support no-encoding\n---\n src/android/jpeg/exif.cpp | 88 +++++++++++++++++++++++++++++++++++----\n src/android/jpeg/exif.h | 10 ++++-\n 2 files changed, 89 insertions(+), 9 deletions(-)","diff":"diff --git a/src/android/jpeg/exif.cpp b/src/android/jpeg/exif.cpp\nindex 33b3fa7f..5d9492fb 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@@ -178,11 +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::Unicode, { 0x55, 0x4e, 0x49, 0x43, 0x4f, 0x44, 0x45, 0x00 } },\n+};\n+\n+void Exif::setString(ExifIfd ifd, ExifTag tag, ExifFormat format,\n+\t\t const std::string &item, StringEncoding encoding)\n {\n \tstd::string ascii;\n \tsize_t length;\n \tconst char *str;\n+\tstd::vector buf;\n \n \tif (format == EXIF_FORMAT_ASCII) {\n \t\tascii = utils::toAscii(item);\n@@ -191,13 +201,47 @@ void Exif::setString(ExifIfd ifd, ExifTag tag, ExifFormat format, const std::str\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\tstd::u16string u16str;\n+\n+\t\tauto encodingString = stringEncodingCodes.find(encoding);\n+\t\tif (encodingString != stringEncodingCodes.end()) {\n+\t\t\tbuf = {\n+\t\t\t\tencodingString->second.begin(),\n+\t\t\t\tencodingString->second.end()\n+\t\t\t};\n+\t\t}\n+\n+\t\tswitch (encoding) {\n+\t\tcase Unicode:\n+\t\t\tu16str = utf8ToUtf16(item);\n+\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\tif (order_ == EXIF_BYTE_ORDER_INTEL) {\n+\t\t\t\t\tbuf[8 + 2 * i] = (u16str[i] & 0xff);\n+\t\t\t\t\tbuf[8 + 2 * i + 1] = ((u16str[i] >> 8) & 0xff);\n+\t\t\t\t} else {\n+\t\t\t\t\tbuf[8 + 2 * i] = ((u16str[i] >> 8) & 0xff);\n+\t\t\t\t\tbuf[8 + 2 * i + 1] = (u16str[i] & 0xff);\n+\t\t\t\t}\n+\t\t\t}\n+\n+\t\t\tstr = reinterpret_cast(buf.data());\n+\t\t\tlength = buf.size();\n+\n+\t\t\tbreak;\n+\t\tcase ASCII:\n+\t\tcase NoEncoding:\n+\t\t\tbuf.insert(buf.end(), item.begin(), item.end());\n+\t\t\tstr = reinterpret_cast(buf.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@@ -290,6 +334,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+\tmbstate_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..73f231b2 100644\n--- a/src/android/jpeg/exif.h\n+++ b/src/android/jpeg/exif.h\n@@ -26,6 +26,12 @@ public:\n \t\tJPEG = 6,\n \t};\n \n+\tenum StringEncoding {\n+\t\tNoEncoding = 0,\n+\t\tASCII = 1,\n+\t\tUnicode = 2,\n+\t};\n+\n \tvoid setMake(const std::string &make);\n \tvoid setModel(const std::string &model);\n \n@@ -46,9 +52,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 const std::string &item, StringEncoding encoding = NoEncoding);\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","v3","1/8"]}