[{"id":12165,"web_url":"https://patchwork.libcamera.org/comment/12165/","msgid":"","date":"2020-08-27T10:13:27","subject":"Re: [libcamera-devel] [PATCH v3 1/2] libcamera: android: Add EXIF\n\tinfrastructure","submitter":{"id":4,"url":"https://patchwork.libcamera.org/api/people/4/","name":"Kieran Bingham","email":"kieran.bingham@ideasonboard.com"},"content":"Hi Umang,\n\nOn 27/08/2020 10:49, Umang Jain wrote:\n> From: Kieran Bingham \n> \n> Provide helper classes to utilise the libexif interfaces and link\n> against libexif to support tag additions when creating JPEG images.\n> \n> Signed-off-by: Kieran Bingham \n> Signed-off-by: Umang Jain \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\n> \n> diff --git a/src/android/jpeg/exif.cpp b/src/android/jpeg/exif.cpp\n> new file mode 100644\n> index 0000000..ce9c69b\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), 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(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 (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 0;\n> +}\n> diff --git a/src/android/jpeg/exif.h b/src/android/jpeg/exif.h\n> new file mode 100644\n> index 0000000..3a132ba\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 \n> +\n> +#include \n> +\n> +#include \n> +\n> +class Exif\n> +{\n> +public:\n> +\tExif();\n> +\t~Exif();\n> +\n> +\tlibcamera::Span data() const { return { exif_data_, 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 *exif_data_;\n\nThis should be exifData_ to follow our coding style.\n\n\n> +\tunsigned int size_;\n> +};\n> +\n> +#endif /* __LIBCAMERA_EXIF_H__ */\n> diff --git a/src/android/meson.build b/src/android/meson.build\n> index 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\nLaurent asked for those to be alphabetically sorted.\n\nOther than those two, I think this is ready for integration., but I'm\nbiased as I started it... so I'll await a tag/comment from someone else.\n\nIf you post a new version with those two comments fixed, add:\n\nReviewed-by: Kieran Bingham \n\nOr I could handle them when applying otherwise if someone else gives a\ntag already.\n\n\n> ]\n> \n> android_camera_metadata = static_library('camera_metadata',\n>","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 AD0D4BDC71\n\tfor ;\n\tThu, 27 Aug 2020 10:13:31 +0000 (UTC)","from lancelot.ideasonboard.com (localhost [IPv6:::1])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTP id 43CFD628D4;\n\tThu, 27 Aug 2020 12:13:31 +0200 (CEST)","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 0BBEE6037A\n\tfor ;\n\tThu, 27 Aug 2020 12:13:30 +0200 (CEST)","from [192.168.0.20]\n\t(cpc89244-aztw30-2-0-cust3082.18-1.cable.virginm.net [86.31.172.11])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id 8D5F59B1;\n\tThu, 27 Aug 2020 12:13:29 +0200 (CEST)"],"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=\"NT9OIloj\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1598523209;\n\tbh=Jeid3IKavXoNwXmgsyNU5/x6qG3WQfCbeoz5jxmanmE=;\n\th=Reply-To:Subject:To:References:From:Date:In-Reply-To:From;\n\tb=NT9OIloj1E+XQXUBe1ZJ0e90s3AQyLsOk9Nsk+N3mTileQBEuv3BBWklSjxx/1Pv7\n\tb1ew1OEI7LLbtvWXW2/8GC70C1IdM+0pdn2pSW0DgGlUVNFKtNEoC++NCF2u7xWj6J\n\tadWnNx+7jbr4UfxSl8SI4T8ibusSybk5k5Ws4vGY=","To":"Umang Jain , libcamera-devel@lists.libcamera.org","References":"<20200827094930.21662-1-email@uajain.com>\n\t<20200827094930.21662-2-email@uajain.com>","From":"Kieran Bingham ","Autocrypt":"addr=kieran.bingham@ideasonboard.com; keydata=\n\t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\n\tWZw01QYHU/GUV/zHJSFk","Organization":"Ideas on Board","Message-ID":"","Date":"Thu, 27 Aug 2020 11:13:27 +0100","User-Agent":"Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101\n\tThunderbird/68.10.0","MIME-Version":"1.0","In-Reply-To":"<20200827094930.21662-2-email@uajain.com>","Content-Language":"en-GB","Subject":"Re: [libcamera-devel] [PATCH v3 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":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Reply-To":"kieran.bingham@ideasonboard.com","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Errors-To":"libcamera-devel-bounces@lists.libcamera.org","Sender":"\"libcamera-devel\" "}}]