Patch Detail
Show a patch.
GET /api/patches/9382/?format=api
{ "id": 9382, "url": "https://patchwork.libcamera.org/api/patches/9382/?format=api", "web_url": "https://patchwork.libcamera.org/patch/9382/", "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": "<20200825201035.13553-1-email@uajain.com>", "date": "2020-08-25T20:10:40", "name": "[libcamera-devel,v2,1/2] libcamera: android: Add EXIF infrastructure", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "c9c62320e69f2de1783253b9a8235ce925130a41", "submitter": { "id": 1, "url": "https://patchwork.libcamera.org/api/people/1/?format=api", "name": "Umang Jain", "email": "email@uajain.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/9382/mbox/", "series": [ { "id": 1242, "url": "https://patchwork.libcamera.org/api/series/1242/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=1242", "date": "2020-08-25T20:10:31", "name": "Initial EXIF metadata support", "version": 2, "mbox": "https://patchwork.libcamera.org/series/1242/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/9382/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/9382/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 C2801BD87E\n\tfor <parsemail@patchwork.libcamera.org>;\n\tTue, 25 Aug 2020 20:10:42 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 8F3B8628CD;\n\tTue, 25 Aug 2020 22:10:42 +0200 (CEST)", "from o1.f.az.sendgrid.net (o1.f.az.sendgrid.net [208.117.55.132])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 86B096037C\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tTue, 25 Aug 2020 22:10:41 +0200 (CEST)", "by filterdrecv-p3mdw1-5b7978bb98-6v6r5 with SMTP id\n\tfilterdrecv-p3mdw1-5b7978bb98-6v6r5-20-5F45703F-6B\n\t2020-08-25 20:10:40.210581051 +0000 UTC m=+2405.590399306", "from mail.uajain.com (unknown)\n\tby ismtpd0006p1maa1.sendgrid.net (SG) with ESMTP\n\tid xq--UUPxQyW0VKvCYvPv_w Tue, 25 Aug 2020 20:10:39.798 +0000 (UTC)" ], "Authentication-Results": "lancelot.ideasonboard.com;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=uajain.com header.i=@uajain.com\n\theader.b=\"K9SqdbXJ\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=uajain.com;\n\th=from:subject:mime-version:to:cc:content-transfer-encoding:\n\tcontent-type;\n\ts=s1; bh=OhuNKkqUEvX9FzUuIh7SR0Wks/BFouW4fm9gZcOJWg4=;\n\tb=K9SqdbXJjr0hshKwplRPsgXAwCWB0EOKT5ebTEww3BZRqim18Q53b4zXcKXo2fXTxKZV\n\tdWnBM0K/Sj/mEfT1bHe+aE/HTtS7nDzSxW/Wdn/G31+wqqplHmZj3e+VnGyxOXquEkQQKQ\n\t88tT39dkeclVjajEuCWGdnPXdGl+MO2/w=", "From": "Umang Jain <email@uajain.com>", "Date": "Tue, 25 Aug 2020 20:10:40 +0000 (UTC)", "Message-Id": "<20200825201035.13553-1-email@uajain.com>", "Mime-Version": "1.0", "X-SG-EID": "1Q40EQ7YGir8a9gjSIAdTjhngY657NMk9ckeo4dbHZDiOpywc/L3L9rFqlwE4KPcw8DXVBj03b84G8OPZYg80wMKQbpvPfpEOZNY4uwW0elLPjQnFV/+9q+UQgnnbh0oo+2YMdSlQWSyt//1t0t7Mla8fWzM+kbDP71pudGVI3jN6K91Z8EKqZdPNDGTEvqoOPPsdUlFJ32gFHfyWD+xIa6YsfNoCPFkvmfz9akVPEm3/xO/eB581EghPckcB1xgWDHQSBqG45yryOlTkzWPFw==", "To": "libcamera-devel@lists.libcamera.org", "Subject": "[libcamera-devel] [PATCH v2 1/2] libcamera: android: Add EXIF\n\tinfrastructure", "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": "From: Kieran Bingham <kieran.bingham@ideasonboard.com>\n\nProvide helper classes to utilise the libexif interfaces and link\nagainst libexif to support tag additions when creating JPEG images.\n\nSigned-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\nSigned-off-by: Umang Jain <email@uajain.com>\n---\n src/android/jpeg/exif.cpp | 176 ++++++++++++++++++++++++++++++++++++++\n src/android/jpeg/exif.h | 45 ++++++++++\n src/android/meson.build | 2 +\n 3 files changed, 223 insertions(+)\n create mode 100644 src/android/jpeg/exif.cpp\n create mode 100644 src/android/jpeg/exif.h", "diff": "diff --git a/src/android/jpeg/exif.cpp b/src/android/jpeg/exif.cpp\nnew file mode 100644\nindex 0000000..f6a9f5c\n--- /dev/null\n+++ b/src/android/jpeg/exif.cpp\n@@ -0,0 +1,176 @@\n+/* SPDX-License-Identifier: GPL-2.0-or-later */\n+/*\n+ * Copyright (C) 2020, Google Inc.\n+ *\n+ * exif.cpp - EXIF tag creation and parser using libexif\n+ */\n+\n+#include \"exif.h\"\n+\n+#include \"libcamera/internal/log.h\"\n+\n+using namespace libcamera;\n+\n+LOG_DEFINE_CATEGORY(EXIF)\n+\n+Exif::Exif()\n+\t: valid_(false), exif_data_(0), size_(0)\n+{\n+\t/* Create an ExifMem allocator to construct entries. */\n+\tmem_ = exif_mem_new_default();\n+\tif (!mem_) {\n+\t\tLOG(EXIF, Fatal) << \"Failed to allocate ExifMem Allocator\";\n+\t\treturn;\n+\t}\n+\n+\tdata_ = exif_data_new_mem(mem_);\n+\tif (!data_) {\n+\t\tLOG(EXIF, Fatal) << \"Failed to allocate an ExifData structure\";\n+\t\treturn;\n+\t}\n+\n+\tvalid_ = true;\n+\n+\texif_data_set_option(data_, EXIF_DATA_OPTION_FOLLOW_SPECIFICATION);\n+\texif_data_set_data_type(data_, EXIF_DATA_TYPE_COMPRESSED);\n+\n+\t/*\n+\t * Big-Endian: EXIF_BYTE_ORDER_MOTOROLA\n+\t * Little Endian: EXIF_BYTE_ORDER_INTEL\n+\t */\n+\texif_data_set_byte_order(data_, EXIF_BYTE_ORDER_INTEL);\n+\n+\t/* Create the mandatory EXIF fields with default data */\n+\texif_data_fix(data_);\n+}\n+\n+Exif::~Exif()\n+{\n+\tif (exif_data_)\n+\t\tfree(exif_data_);\n+\n+\tif (data_)\n+\t\texif_data_unref(data_);\n+\n+\tif (mem_)\n+\t\texif_mem_unref(mem_);\n+}\n+\n+ExifEntry *Exif::createEntry(ExifIfd ifd, ExifTag tag)\n+{\n+\tExifContent *content = data_->ifd[ifd];\n+\tExifEntry *entry = exif_content_get_entry(content, tag);\n+\n+\tif (entry) {\n+\t\texif_entry_ref(entry);\n+\t\treturn entry;\n+\t}\n+\n+\tentry = exif_entry_new_mem(mem_);\n+\tif (!entry) {\n+\t\tLOG(EXIF, Fatal) << \"Failed to allocated new entry\";\n+\t\treturn nullptr;\n+\t}\n+\n+\tentry->tag = tag;\n+\n+\texif_content_add_entry(content, entry);\n+\texif_entry_initialize(entry, tag);\n+\n+\treturn entry;\n+}\n+\n+ExifEntry *Exif::createEntry(ExifIfd ifd, ExifTag tag, ExifFormat format,\n+\t\t\t uint64_t components, unsigned int size)\n+{\n+\tExifContent *content = data_->ifd[ifd];\n+\n+\t/* Replace any existing entry with the same tag. */\n+\tExifEntry *existing = exif_content_get_entry(content, tag);\n+\texif_content_remove_entry(content, existing);\n+\n+\tExifEntry *entry = exif_entry_new_mem(mem_);\n+\tif (!entry) {\n+\t\tLOG(EXIF, Fatal) << \"Failed to allocated new entry\";\n+\t\treturn nullptr;\n+\t}\n+\n+\tvoid *buffer = exif_mem_alloc(mem_, size);\n+\tif (!buffer) {\n+\t\tLOG(EXIF, Fatal) << \"Failed to allocate buffer for variable entry\";\n+\t\texif_mem_unref(mem_);\n+\t\treturn nullptr;\n+\t}\n+\n+\tentry->data = static_cast<unsigned char *>(buffer);\n+\tentry->components = components;\n+\tentry->format = format;\n+\tentry->size = size;\n+\tentry->tag = tag;\n+\n+\texif_content_add_entry(content, entry);\n+\n+\treturn entry;\n+}\n+\n+int Exif::setShort(ExifIfd ifd, ExifTag tag, uint16_t item)\n+{\n+\tExifEntry *entry = createEntry(ifd, tag);\n+\n+\texif_set_short(entry->data, EXIF_BYTE_ORDER_INTEL, item);\n+\texif_entry_unref(entry);\n+\n+\treturn 0;\n+}\n+\n+int Exif::setLong(ExifIfd ifd, ExifTag tag, uint32_t item)\n+{\n+\tExifEntry *entry = createEntry(ifd, tag);\n+\n+\texif_set_long(entry->data, EXIF_BYTE_ORDER_INTEL, item);\n+\texif_entry_unref(entry);\n+\n+\treturn 0;\n+}\n+\n+int Exif::setRational(ExifIfd ifd, ExifTag tag, uint32_t numerator, uint32_t denominator)\n+{\n+\tExifEntry *entry = createEntry(ifd, tag);\n+\tExifRational item{ numerator, denominator };\n+\n+\texif_set_rational(entry->data, EXIF_BYTE_ORDER_INTEL, item);\n+\texif_entry_unref(entry);\n+\n+\treturn 0;\n+}\n+\n+int Exif::setString(ExifIfd ifd, ExifTag tag, ExifFormat format, const std::string &item)\n+{\n+\tsize_t length = item.length();\n+\n+\tExifEntry *entry = createEntry(ifd, tag, format, length, length);\n+\tif (!entry) {\n+\t\tLOG(EXIF, Error) << \"Failed to add tag: \" << tag;\n+\t\treturn -ENOMEM;\n+\t}\n+\n+\tmemcpy(entry->data, item.c_str(), length);\n+\texif_entry_unref(entry);\n+\n+\treturn 0;\n+}\n+\n+Span<uint8_t> Exif::generate()\n+{\n+\tif (exif_data_) {\n+\t\tfree(exif_data_);\n+\t\texif_data_ = nullptr;\n+\t}\n+\n+\texif_data_save_data(data_, &exif_data_, &size_);\n+\n+\tLOG(EXIF, Debug) << \"Created EXIF instance (\" << size_ << \" bytes)\";\n+\n+\treturn { exif_data_, size_ };\n+}\n+\ndiff --git a/src/android/jpeg/exif.h b/src/android/jpeg/exif.h\nnew file mode 100644\nindex 0000000..7df83c7\n--- /dev/null\n+++ b/src/android/jpeg/exif.h\n@@ -0,0 +1,45 @@\n+/* SPDX-License-Identifier: GPL-2.0-or-later */\n+/*\n+ * Copyright (C) 2020, Google Inc.\n+ *\n+ * exif.h - EXIF tag creator and parser using libexif\n+ */\n+#ifndef __LIBCAMERA_EXIF_H__\n+#define __LIBCAMERA_EXIF_H__\n+\n+#include <libexif/exif-data.h>\n+\n+#include <libcamera/span.h>\n+\n+#include <string>\n+\n+class Exif\n+{\n+public:\n+\tExif();\n+\t~Exif();\n+\n+\tint setShort(ExifIfd ifd, ExifTag tag, uint16_t item);\n+\tint setLong(ExifIfd ifd, ExifTag tag, uint32_t item);\n+\tint setString(ExifIfd ifd, ExifTag tag, ExifFormat format, const std::string &item);\n+\tint setRational(ExifIfd ifd, ExifTag tag, uint32_t numerator, uint32_t denominator);\n+\n+\tlibcamera::Span<uint8_t> generate();\n+\tunsigned char *data() const { return exif_data_; }\n+\tunsigned int size() const { return size_; }\n+\n+private:\n+\tExifEntry *createEntry(ExifIfd ifd, ExifTag tag);\n+\tExifEntry *createEntry(ExifIfd ifd, ExifTag tag, ExifFormat format,\n+\t\t\t uint64_t components, unsigned int size);\n+\n+\tbool valid_;\n+\n+\tExifData *data_;\n+\tExifMem *mem_;\n+\n+\tunsigned char *exif_data_;\n+\tunsigned int size_;\n+};\n+\n+#endif /* __LIBCAMERA_EXIF_H__ */\ndiff --git a/src/android/meson.build b/src/android/meson.build\nindex f7b81a4..0f49b25 100644\n--- a/src/android/meson.build\n+++ b/src/android/meson.build\n@@ -7,6 +7,7 @@ android_hal_sources = files([\n 'camera_metadata.cpp',\n 'camera_ops.cpp',\n 'jpeg/encoder_libjpeg.cpp',\n+ 'jpeg/exif.cpp',\n ])\n \n android_camera_metadata_sources = files([\n@@ -15,6 +16,7 @@ android_camera_metadata_sources = files([\n \n android_deps = [\n dependency('libjpeg'),\n+ dependency('libexif'),\n ]\n \n android_camera_metadata = static_library('camera_metadata',\n", "prefixes": [ "libcamera-devel", "v2", "1/2" ] }