Patch Detail
Show a patch.
GET /api/patches/9411/?format=api
{ "id": 9411, "url": "https://patchwork.libcamera.org/api/patches/9411/?format=api", "web_url": "https://patchwork.libcamera.org/patch/9411/", "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": "<20200828065727.9909-2-email@uajain.com>", "date": "2020-08-28T06:57:35", "name": "[libcamera-devel,v4,1/2] libcamera: android: Add EXIF infrastructure", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "51a2b195c0d82edef89e0aed75bab4175c474ae1", "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/9411/mbox/", "series": [ { "id": 1247, "url": "https://patchwork.libcamera.org/api/series/1247/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=1247", "date": "2020-08-28T06:57:32", "name": "Initial EXIF metadata support", "version": 4, "mbox": "https://patchwork.libcamera.org/series/1247/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/9411/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/9411/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 5CB26BDC71\n\tfor <parsemail@patchwork.libcamera.org>;\n\tFri, 28 Aug 2020 06:57:39 +0000 (UTC)", "from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 2A28A62922;\n\tFri, 28 Aug 2020 08:57:39 +0200 (CEST)", "from wrqvntvw.outbound-mail.sendgrid.net\n\t(wrqvntvw.outbound-mail.sendgrid.net [149.72.39.137])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 39F8D62919\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tFri, 28 Aug 2020 08:57:37 +0200 (CEST)", "by filterdrecv-p3iad2-787bb5c9bc-jc7mb with SMTP id\n\tfilterdrecv-p3iad2-787bb5c9bc-jc7mb-18-5F48AADE-46\n\t2020-08-28 06:57:35.117886542 +0000 UTC m=+46666.866484751", "from mail.uajain.com (unknown)\n\tby ismtpd0002p1maa1.sendgrid.net (SG) with ESMTP\n\tid zyHjodtJT2GMLOj9e6paPg Fri, 28 Aug 2020 06:57:34.558 +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=\"X3BuDKaU\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=uajain.com;\n\th=from:subject:in-reply-to:references:mime-version:to:cc:\n\tcontent-transfer-encoding:content-type;\n\ts=s1; bh=lmu43f2D0fiDgcCnnKSc2BmAEZD100J3f2BT30jiXFE=;\n\tb=X3BuDKaUQ2ahpEb9eeJQTXOnZE8aTjlYp5kpVNs4ctLj/KQ5I/H4M5nQo3naJGG8D1/p\n\tozpGFs5dB0/LTlgQWqsV9jGsPHL2pdZV8gmn+O1FEbJfDdLE8Hs29AMqZNPFZXNoJRArYW\n\tD9tE4sh+GQ8LF/ZTASmPGDIyBKr+86a48=", "From": "Umang Jain <email@uajain.com>", "Date": "Fri, 28 Aug 2020 06:57:35 +0000 (UTC)", "Message-Id": "<20200828065727.9909-2-email@uajain.com>", "In-Reply-To": "<20200828065727.9909-1-email@uajain.com>", "References": "<20200828065727.9909-1-email@uajain.com>", "Mime-Version": "1.0", "X-SG-EID": "1Q40EQ7YGir8a9gjSIAdTjhngY657NMk9ckeo4dbHZDiOpywc/L3L9rFqlwE4KPcytdNsKVIgBmp5SVZAuCwQdx1+49wwpvdvD0Pg/+j1if1YtEqeGdt73qOtY/plDjZ6h8nCTFQxr4k4iv7LMfhlFIAnDtu+e8uwbL2FtX0P1GBexKv3eTVVmLevgdznhHgk62BnkdxWTf/h2jegn78rjfT+BJG1Y6l0AGybKezlBTspSTHIOh+YVPPpwXzw/Rr4lLnO7ILwo42Gn7jY9xlmw==", "To": "libcamera-devel@lists.libcamera.org", "Subject": "[libcamera-devel] [PATCH v4 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>\nReviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>\n---\n src/android/jpeg/exif.cpp | 172 ++++++++++++++++++++++++++++++++++++++\n src/android/jpeg/exif.h | 44 ++++++++++\n src/android/meson.build | 2 +\n 3 files changed, 218 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..b49b538\n--- /dev/null\n+++ b/src/android/jpeg/exif.cpp\n@@ -0,0 +1,172 @@\n+/* SPDX-License-Identifier: GPL-2.0-or-later */\n+/*\n+ * Copyright (C) 2020, Google Inc.\n+ *\n+ * exif.cpp - EXIF tag creation 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), exifData_(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 (exifData_)\n+\t\tfree(exifData_);\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+\t/* Pad 1 extra byte for null-terminated string. */\n+\tsize_t length = item.length() + 1;\n+\n+\tExifEntry *entry = createEntry(ifd, tag, format, length, length);\n+\n+\tmemcpy(entry->data, item.c_str(), length);\n+\texif_entry_unref(entry);\n+\n+\treturn 0;\n+}\n+\n+int Exif::generate()\n+{\n+\tif (exifData_) {\n+\t\tfree(exifData_);\n+\t\texifData_ = nullptr;\n+\t}\n+\n+\texif_data_save_data(data_, &exifData_, &size_);\n+\n+\tLOG(EXIF, Debug) << \"Created EXIF instance (\" << size_ << \" bytes)\";\n+\n+\treturn 0;\n+}\ndiff --git a/src/android/jpeg/exif.h b/src/android/jpeg/exif.h\nnew file mode 100644\nindex 0000000..6c10f94\n--- /dev/null\n+++ b/src/android/jpeg/exif.h\n@@ -0,0 +1,44 @@\n+/* SPDX-License-Identifier: GPL-2.0-or-later */\n+/*\n+ * Copyright (C) 2020, Google Inc.\n+ *\n+ * exif.h - EXIF tag creator using libexif\n+ */\n+#ifndef __ANDROID_JPEG_EXIF_H__\n+#define __ANDROID_JPEG_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+\tlibcamera::Span<const uint8_t> data() const { return { exifData_, size_ }; }\n+\tint generate();\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+\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+\tbool valid_;\n+\n+\tExifData *data_;\n+\tExifMem *mem_;\n+\n+\tunsigned char *exifData_;\n+\tunsigned int size_;\n+};\n+\n+#endif /* __ANDROID_JPEG_EXIF_H__ */\ndiff --git a/src/android/meson.build b/src/android/meson.build\nindex f7b81a4..ecb92f6 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@@ -14,6 +15,7 @@ android_camera_metadata_sources = files([\n ])\n \n android_deps = [\n+ dependency('libexif'),\n dependency('libjpeg'),\n ]\n \n", "prefixes": [ "libcamera-devel", "v4", "1/2" ] }