From patchwork Sun Jun 12 18:46:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 36184 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:1a22:b0:84:42e0:ad30 with SMTP id cj34csp123526pzb; Sun, 12 Jun 2022 11:46:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxd/9niIy0p73NFEM3gfEDmsMEz9RPVBGOhLQQA4fD7ozeE+2oXsAhggk37SGfIq94IfXPV X-Received: by 2002:a17:906:ee1:b0:70d:d293:7b30 with SMTP id x1-20020a1709060ee100b0070dd2937b30mr44071355eji.134.1655059606882; Sun, 12 Jun 2022 11:46:46 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id w22-20020aa7cb56000000b0042dd79cd7a6si5301518edt.557.2022.06.12.11.46.46; Sun, 12 Jun 2022 11:46:46 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=jXBNf8PY; arc=fail (body hash mismatch); spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 43FC668B56D; Sun, 12 Jun 2022 21:46:42 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2103.outbound.protection.outlook.com [40.92.90.103]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CD4DF68B194 for ; Sun, 12 Jun 2022 21:46:34 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FbhrTI1keUK3aHeKU3H07/Bw8HTfD1h9smK16vDor9YLuQbKU+X0ERipO3Jsm+K94DcV32Mw6ThX3O7JqG9Wte6AIzFG2s2NXLTpxN16+xH5efnbVz9amjYoEYeLD6As9tg7IrCLWLa33KZNOaQq8S3Dyux+epG7MsplLzd4HBQpcZ5WjYmDUZgtaWJDDXN1QjOLdNRBShD9zDOoJ8asYpu0nsSPqu1yzd4gS6J8lEQNllHT60lxNWzQ4P7Ynq4pkDFTDhePko648ZJYMJQCemMiXOBL5M0FUm8FtzvmfTlFKlCi2sIZEHfaJqMaJJ3Dd5NdLNR3xn6sJdqDsrDk4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=KxgeqZr8r3b4ogW3SdjERBaUyiRV7BqLv1bAHajaJFw=; b=eE6vgLUJ+UKnKAjDHBFqowmxJ8DjZXo450FnDtQc8in1S9dGSzvUD2QRnMYFiudyAXfBuj/YpBMmGHtW8Jgs7YB+gtoDZkuZykarm2PSwPZ7nbb6Hr0VxVAOgwz90Xc4Ag1/1/eI8Uh8UJ+yNjmRZLN3YhpAu82NVLN0BbGIRHiScwwWmN5YtV9Q1BCPE2/AEwabS8lvn/PPh9rkar6LHVOsIFKF6RL426rtwXK95dYShlkqE1aHKyuSYox4rZ+34GrKVWUIuDyt9qjJXNQo88fqCmyK648c1kNYAuV8HZw4eABrEfSMMbXSYnwgTFSEmexW6ghkpUR5KanSnyadiQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=KxgeqZr8r3b4ogW3SdjERBaUyiRV7BqLv1bAHajaJFw=; b=jXBNf8PYgsKJDxs/l4cRSWSTOjsc8F9Le5IIRnrONwC3Wdr5MNYfPxW0LUxKMLsqv5NCCm0q7/AUp4mw8hbFJtDnUHa1yMol3/sqEOCs9jdqqV6UB48l0ggFAf6T4y0oj7uWIV0nKOuBXg9luqU0pnYNgFrR5rlT1Gh4khZkpoz8ZHy4cigjNyNOCXzDbc8gkbRyfXXXszGjY/Wb9APkYZZL9SwhXBSd9UHrea6GXYoeiUfr005m6mi9z2GORInsknfUqmyGtqxigUy8p8NufXsCZWaaj1V+3WghrzQuOhVVpE3YMMNYB507NZdpxA0uX6RB0Y/KVzkF3oEOWVqLMg== Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) by AM8PR01MB7963.eurprd01.prod.exchangelabs.com (2603:10a6:20b:36e::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5332.13; Sun, 12 Jun 2022 18:46:32 +0000 Received: from DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c]) by DB6PR0101MB2214.eurprd01.prod.exchangelabs.com ([fe80::60b9:9f29:40cc:f01c%10]) with mapi id 15.20.5332.020; Sun, 12 Jun 2022 18:46:32 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 12 Jun 2022 20:46:24 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [WYub8vTODQIsnC+YLmADvEUdutpNojFk] X-ClientProxiedBy: ZR0P278CA0074.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:22::7) To DB6PR0101MB2214.eurprd01.prod.exchangelabs.com (2603:10a6:4:42::27) X-Microsoft-Original-Message-ID: <20220612184624.178531-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 162d0d59-21e7-40dd-7095-08da4ca3de69 X-MS-Exchange-SLBlob-MailProps: f36zkjAOy3WapQJ7mpZjZMiq6LAkgn9K/MjBk5TDzmuSJJOt7aQBKPPSnf85Y5gPD17eJ5U/0ASZpsO3XM0B8/LZgV7HRC/Z+k5WGlyX4/1QGSrmVOF76Pnq7M1qliiOBg9gUUNvMgbsta0SnfSPDu9A0LCi47wr5cHGW185ms7r3UT0zU/6F7e/92pg1SU02uEpBMhxyiAD9NgLyKTinbzkr8jhFesNcBTiJVYM1CQwfN4ZsUQUzq2g3Y+ASC1UDjBu9vlTfKDuJcr1ovJsXXfsFwSgZwvIv10IJjF7ODsFOomX1FZbSboKc8ADjeLhiPj+ldor/v71V5fN/4x4LrlyS5CRvUEXUQCOqxkCLBEvadMnTU3q+t9g5aEqax2iYvhisy64/vfOLrEkoqofvlH590Y13ub4Ceamo7NTksCWTK7z9GXYUbVCIp9QPqjrOc+6QGPKsF8WAXv5FBMHrlOWydXkmjPj3YJBPqlO2VrLHMJN8JkOZro428Tm+UgIm9ndLpmvOnfIeQE8wL0Bw5tuwXRqtcKnfedO3O6wFF7OhUQEK6WHM9mmof59/4DemwtHXRvFKzRNCmJjmY8vl12QORmfU6AJcvpTm+oQa8WMPrjrdyJpimNeddFYRuygEo6ymcpxySLj+tNecFXzMKaYkAdL2YzJ3uJOpIM0xfyXmlA4bylKxMzbalwH0ckDTn8i0UIa9FIsrBGBBzlQl1clF9w2HkO64DCHPfPSHzE= X-MS-TrafficTypeDiagnostic: AM8PR01MB7963:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QwWyBICnP1+fRTRBZhQRF2LzAWIxzL52o95f0SoYglGY7XeJjxctKk731d3oQWGEogV1umEm1eVx0OdtacKzFgetkIvoNMrVIEEO9qew1ErLOO8F8F6WxETIOSU4qYbwl5ehHPTjA6cjtq+RY1+GcNm/iGn2pwsjFhges3x+R7DKSlTXITaPwEivnO3IIywOgF+oBCq4YUCneB8ceN6k2mmCnBj7980ePDX/di8jSbJiIfnmE14DXrAQCPNxBI43dgWEnjVUBuF93+1JpxXLKTp8iytUe5M+WAwk2hrpTJgyhzLl8PNty+HTrlq1Nc6SLap6Dd+a4DxnDl24j+0mqXeP0zsG2WnaJKR2MIM9L1BwvNCIgOggm9kNBXWO3raABXfXxn4/5aAXS9c2wr+WzBSixJYqtKxV6oh18Wg9ZTf/uFI4TTOrwpA3SdHdsaa8IhII/V4Sow96aFoCaKpic6aeR8tGWV+6Qhs3L2win8guiXDKClnlg6IRH/tjfdOD9Gul9d1IoKr1ANrko71uR+G5O9oqEqMkiMIzaScZnK8xe4+ydpa5ZtCQ1RCvG4NHDTjpfptBzzqrW7FBCyKJwg== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 8hN7+S5ZPk5GL6fs/VsglMf925NU7nHz3Urb5IE8nLJg54NQY0uUuMb/GaDKSv0jcOlB6zyEqjHtgY3TyBjtQbbb8ADE3oYBxWs1vBlfFFBohBYFXlkW8W8PCZ7iiJ1b0wcrE2i5Kq/YwXPkWvkvR6mih0jx08FSlD6tr6tuB5EfR+F9q2bMaTpW1GQsqpA9szn6lN91E1UXBkaSq+opy2SLC3e6gzTb91D27bTMXP1pZ+e2i5xeupPrxt8QWC76L4CBNRPiBU/NoQ9fipLTmRg2bLs6tfCtt35h9tYkKXHEtnA4zm7iuZ4L4Zx7MX7sA6ums7gcmG/pKo+Difgjiknhrkl5gfB6uqGVoUvkhLteZA8ZDQ4Ce9BjMySL+vdlOZ3jASoVVA571UhRIWflNlRAZPVIqCAxwH1197Xkd0Ff2scCb4lTX69ua/01XG1Sd+YVXsQe/uFuHru/h5JkOOx/U6bb72imm9QF0l0XB9LKviCPkWC2yqiaHlq/IVYhP8ZkbGkK+jR0jenDVgAdvU7hIaCk3vYm5rdoYqmCS5/IhiQGd89cAXFJmtSAvSUgmMbF9ybv3c9r1Hqt0fmvud6veAEeQGGt9cFid7MSlT9kicmYAhsK53bheOCN/mb75Z6bb9k/F7MRvXxaDxEIJiEmS6Xsan95JUMjH2j/iXnnxRSu6Vlwr7HdY+Mnsf3u1tgcq3G2McF/yBPVKKSXV0fPszq9enyJz20c01o1p57Pj4URaMKEGbzR1EFiD+LDwzzumppxssAhV6EQp+y8GGRg/U1thouDGGUW1Z1F6dGUOo2ko2M278AvHes02YWHZAYc63chmUEnyYRXFPaP2JCP4VouP1uh92Dn4kFhypAjuHrK3pZEyN43yCMUZKoo2K1IesWm5QG9piXJPIYSzl4trwv+lB6YXvC0NjLE7s6lD7E1bO5CVRAykC/recsrk5MUtzVjI6wQPK3CTmoOGN4cdFRoPUm5ZnYYuH8hlliKVMq4IuoI7w9GN7FyHawJ7X3DG1aksBN81LFcPld6oJcZZ6MpOLovVQgavIksGG4fSGT/+VFjJYNcqA9oIohofD8TvAG+N8n2K/ewCAJSBzaZkJahGh7CAlm8LTYVXD7ql4WhX8294IzQ/4bo7nh1sZ0NyNRGJaVLg48w5TY5yUHIt0XFjAHGX/0/HvmVQ4PwjqQsIMqDbrcks2eQBgmGG53G90kkeXvNVBXc6NanP5m1VMUYjTBrohQ2MyUIZu/DbCE6GT7cL58v17cg6Bk7rDrI/wI8AqHzY6TIFER+Nb5RyGh6aT77PcTddx+mU/OraNtthbpO87EV3ypK7qsXLc+ioRHFjSwedHpJxNikUsoCZ1h2dDDXI0alqh//1+gmc2Qsw8+wZZxykrUt9rcPk9pIr0QE564pjlsFIRNXxd0nOtqrSHq/X/i7J0cKQdTya2dDteCAdpkhxeDy/HKrPPxCkOCl8zTzF9rVH7m9tA== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 162d0d59-21e7-40dd-7095-08da4ca3de69 X-MS-Exchange-CrossTenant-AuthSource: DB6PR0101MB2214.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jun 2022 18:46:32.5085 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM8PR01MB7963 Subject: [FFmpeg-devel] [PATCH] avcodec/exif: Move tag_list out of header X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Xwrlqc3PdzTF It is only used by exif.c (and e.g. EXIF_TAG_NAME_LENGTH is an implementation detail anyway). Also remove the sentinel, as it is used in conjunction with FF_ARRAY_ELEMS. Signed-off-by: Andreas Rheinhardt --- libavcodec/exif.c | 127 ++++++++++++++++++++++++++++++++++++++++++++ libavcodec/exif.h | 130 ---------------------------------------------- 2 files changed, 127 insertions(+), 130 deletions(-) diff --git a/libavcodec/exif.c b/libavcodec/exif.c index 9485b24b8e..959d114d09 100644 --- a/libavcodec/exif.c +++ b/libavcodec/exif.c @@ -28,6 +28,133 @@ #include "exif.h" #include "tiff_common.h" +#define EXIF_TAG_NAME_LENGTH 32 + +struct exif_tag { + char name[EXIF_TAG_NAME_LENGTH]; + uint16_t id; +}; + +static const struct exif_tag tag_list[] = { // JEITA CP-3451 EXIF specification: + {"GPSVersionID", 0x00}, // <- Table 12 GPS Attribute Information + {"GPSLatitudeRef", 0x01}, + {"GPSLatitude", 0x02}, + {"GPSLongitudeRef", 0x03}, + {"GPSLongitude", 0x04}, + {"GPSAltitudeRef", 0x05}, + {"GPSAltitude", 0x06}, + {"GPSTimeStamp", 0x07}, + {"GPSSatellites", 0x08}, + {"GPSStatus", 0x09}, + {"GPSMeasureMode", 0x0A}, + {"GPSDOP", 0x0B}, + {"GPSSpeedRef", 0x0C}, + {"GPSSpeed", 0x0D}, + {"GPSTrackRef", 0x0E}, + {"GPSTrack", 0x0F}, + {"GPSImgDirectionRef", 0x10}, + {"GPSImgDirection", 0x11}, + {"GPSMapDatum", 0x12}, + {"GPSDestLatitudeRef", 0x13}, + {"GPSDestLatitude", 0x14}, + {"GPSDestLongitudeRef", 0x15}, + {"GPSDestLongitude", 0x16}, + {"GPSDestBearingRef", 0x17}, + {"GPSDestBearing", 0x18}, + {"GPSDestDistanceRef", 0x19}, + {"GPSDestDistance", 0x1A}, + {"GPSProcessingMethod", 0x1B}, + {"GPSAreaInformation", 0x1C}, + {"GPSDateStamp", 0x1D}, + {"GPSDifferential", 0x1E}, + {"ImageWidth", 0x100}, // <- Table 3 TIFF Rev. 6.0 Attribute Information Used in Exif + {"ImageLength", 0x101}, + {"BitsPerSample", 0x102}, + {"Compression", 0x103}, + {"PhotometricInterpretation", 0x106}, + {"Orientation", 0x112}, + {"SamplesPerPixel", 0x115}, + {"PlanarConfiguration", 0x11C}, + {"YCbCrSubSampling", 0x212}, + {"YCbCrPositioning", 0x213}, + {"XResolution", 0x11A}, + {"YResolution", 0x11B}, + {"ResolutionUnit", 0x128}, + {"StripOffsets", 0x111}, + {"RowsPerStrip", 0x116}, + {"StripByteCounts", 0x117}, + {"JPEGInterchangeFormat", 0x201}, + {"JPEGInterchangeFormatLength",0x202}, + {"TransferFunction", 0x12D}, + {"WhitePoint", 0x13E}, + {"PrimaryChromaticities", 0x13F}, + {"YCbCrCoefficients", 0x211}, + {"ReferenceBlackWhite", 0x214}, + {"DateTime", 0x132}, + {"ImageDescription", 0x10E}, + {"Make", 0x10F}, + {"Model", 0x110}, + {"Software", 0x131}, + {"Artist", 0x13B}, + {"Copyright", 0x8298}, + {"ExifVersion", 0x9000}, // <- Table 4 Exif IFD Attribute Information (1) + {"FlashpixVersion", 0xA000}, + {"ColorSpace", 0xA001}, + {"ComponentsConfiguration", 0x9101}, + {"CompressedBitsPerPixel", 0x9102}, + {"PixelXDimension", 0xA002}, + {"PixelYDimension", 0xA003}, + {"MakerNote", 0x927C}, + {"UserComment", 0x9286}, + {"RelatedSoundFile", 0xA004}, + {"DateTimeOriginal", 0x9003}, + {"DateTimeDigitized", 0x9004}, + {"SubSecTime", 0x9290}, + {"SubSecTimeOriginal", 0x9291}, + {"SubSecTimeDigitized", 0x9292}, + {"ImageUniqueID", 0xA420}, + {"ExposureTime", 0x829A}, // <- Table 5 Exif IFD Attribute Information (2) + {"FNumber", 0x829D}, + {"ExposureProgram", 0x8822}, + {"SpectralSensitivity", 0x8824}, + {"ISOSpeedRatings", 0x8827}, + {"OECF", 0x8828}, + {"ShutterSpeedValue", 0x9201}, + {"ApertureValue", 0x9202}, + {"BrightnessValue", 0x9203}, + {"ExposureBiasValue", 0x9204}, + {"MaxApertureValue", 0x9205}, + {"SubjectDistance", 0x9206}, + {"MeteringMode", 0x9207}, + {"LightSource", 0x9208}, + {"Flash", 0x9209}, + {"FocalLength", 0x920A}, + {"SubjectArea", 0x9214}, + {"FlashEnergy", 0xA20B}, + {"SpatialFrequencyResponse", 0xA20C}, + {"FocalPlaneXResolution", 0xA20E}, + {"FocalPlaneYResolution", 0xA20F}, + {"FocalPlaneResolutionUnit", 0xA210}, + {"SubjectLocation", 0xA214}, + {"ExposureIndex", 0xA215}, + {"SensingMethod", 0xA217}, + {"FileSource", 0xA300}, + {"SceneType", 0xA301}, + {"CFAPattern", 0xA302}, + {"CustomRendered", 0xA401}, + {"ExposureMode", 0xA402}, + {"WhiteBalance", 0xA403}, + {"DigitalZoomRatio", 0xA404}, + {"FocalLengthIn35mmFilm", 0xA405}, + {"SceneCaptureType", 0xA406}, + {"GainControl", 0xA407}, + {"Contrast", 0xA408}, + {"Saturation", 0xA409}, + {"Sharpness", 0xA40A}, + {"DeviceSettingDescription", 0xA40B}, + {"SubjectDistanceRange", 0xA40C} +// {"InteroperabilityIndex", 0x1}, // <- Table 13 Interoperability IFD Attribute Information +}; static const char *exif_get_tag_name(uint16_t id) { diff --git a/libavcodec/exif.h b/libavcodec/exif.h index ffacba7e66..f70d21391a 100644 --- a/libavcodec/exif.h +++ b/libavcodec/exif.h @@ -32,136 +32,6 @@ #include "libavutil/dict.h" #include "bytestream.h" -#define EXIF_MAX_IFD_RECURSION 2 -#define EXIF_TAG_NAME_LENGTH 32 - -struct exif_tag { - char name[EXIF_TAG_NAME_LENGTH]; - uint16_t id; -}; - -static const struct exif_tag tag_list[] = { // JEITA CP-3451 EXIF specification: - {"GPSVersionID", 0x00}, // <- Table 12 GPS Attribute Information - {"GPSLatitudeRef", 0x01}, - {"GPSLatitude", 0x02}, - {"GPSLongitudeRef", 0x03}, - {"GPSLongitude", 0x04}, - {"GPSAltitudeRef", 0x05}, - {"GPSAltitude", 0x06}, - {"GPSTimeStamp", 0x07}, - {"GPSSatellites", 0x08}, - {"GPSStatus", 0x09}, - {"GPSMeasureMode", 0x0A}, - {"GPSDOP", 0x0B}, - {"GPSSpeedRef", 0x0C}, - {"GPSSpeed", 0x0D}, - {"GPSTrackRef", 0x0E}, - {"GPSTrack", 0x0F}, - {"GPSImgDirectionRef", 0x10}, - {"GPSImgDirection", 0x11}, - {"GPSMapDatum", 0x12}, - {"GPSDestLatitudeRef", 0x13}, - {"GPSDestLatitude", 0x14}, - {"GPSDestLongitudeRef", 0x15}, - {"GPSDestLongitude", 0x16}, - {"GPSDestBearingRef", 0x17}, - {"GPSDestBearing", 0x18}, - {"GPSDestDistanceRef", 0x19}, - {"GPSDestDistance", 0x1A}, - {"GPSProcessingMethod", 0x1B}, - {"GPSAreaInformation", 0x1C}, - {"GPSDateStamp", 0x1D}, - {"GPSDifferential", 0x1E}, - {"ImageWidth", 0x100}, // <- Table 3 TIFF Rev. 6.0 Attribute Information Used in Exif - {"ImageLength", 0x101}, - {"BitsPerSample", 0x102}, - {"Compression", 0x103}, - {"PhotometricInterpretation", 0x106}, - {"Orientation", 0x112}, - {"SamplesPerPixel", 0x115}, - {"PlanarConfiguration", 0x11C}, - {"YCbCrSubSampling", 0x212}, - {"YCbCrPositioning", 0x213}, - {"XResolution", 0x11A}, - {"YResolution", 0x11B}, - {"ResolutionUnit", 0x128}, - {"StripOffsets", 0x111}, - {"RowsPerStrip", 0x116}, - {"StripByteCounts", 0x117}, - {"JPEGInterchangeFormat", 0x201}, - {"JPEGInterchangeFormatLength",0x202}, - {"TransferFunction", 0x12D}, - {"WhitePoint", 0x13E}, - {"PrimaryChromaticities", 0x13F}, - {"YCbCrCoefficients", 0x211}, - {"ReferenceBlackWhite", 0x214}, - {"DateTime", 0x132}, - {"ImageDescription", 0x10E}, - {"Make", 0x10F}, - {"Model", 0x110}, - {"Software", 0x131}, - {"Artist", 0x13B}, - {"Copyright", 0x8298}, - {"ExifVersion", 0x9000}, // <- Table 4 Exif IFD Attribute Information (1) - {"FlashpixVersion", 0xA000}, - {"ColorSpace", 0xA001}, - {"ComponentsConfiguration", 0x9101}, - {"CompressedBitsPerPixel", 0x9102}, - {"PixelXDimension", 0xA002}, - {"PixelYDimension", 0xA003}, - {"MakerNote", 0x927C}, - {"UserComment", 0x9286}, - {"RelatedSoundFile", 0xA004}, - {"DateTimeOriginal", 0x9003}, - {"DateTimeDigitized", 0x9004}, - {"SubSecTime", 0x9290}, - {"SubSecTimeOriginal", 0x9291}, - {"SubSecTimeDigitized", 0x9292}, - {"ImageUniqueID", 0xA420}, - {"ExposureTime", 0x829A}, // <- Table 5 Exif IFD Attribute Information (2) - {"FNumber", 0x829D}, - {"ExposureProgram", 0x8822}, - {"SpectralSensitivity", 0x8824}, - {"ISOSpeedRatings", 0x8827}, - {"OECF", 0x8828}, - {"ShutterSpeedValue", 0x9201}, - {"ApertureValue", 0x9202}, - {"BrightnessValue", 0x9203}, - {"ExposureBiasValue", 0x9204}, - {"MaxApertureValue", 0x9205}, - {"SubjectDistance", 0x9206}, - {"MeteringMode", 0x9207}, - {"LightSource", 0x9208}, - {"Flash", 0x9209}, - {"FocalLength", 0x920A}, - {"SubjectArea", 0x9214}, - {"FlashEnergy", 0xA20B}, - {"SpatialFrequencyResponse", 0xA20C}, - {"FocalPlaneXResolution", 0xA20E}, - {"FocalPlaneYResolution", 0xA20F}, - {"FocalPlaneResolutionUnit", 0xA210}, - {"SubjectLocation", 0xA214}, - {"ExposureIndex", 0xA215}, - {"SensingMethod", 0xA217}, - {"FileSource", 0xA300}, - {"SceneType", 0xA301}, - {"CFAPattern", 0xA302}, - {"CustomRendered", 0xA401}, - {"ExposureMode", 0xA402}, - {"WhiteBalance", 0xA403}, - {"DigitalZoomRatio", 0xA404}, - {"FocalLengthIn35mmFilm", 0xA405}, - {"SceneCaptureType", 0xA406}, - {"GainControl", 0xA407}, - {"Contrast", 0xA408}, - {"Saturation", 0xA409}, - {"Sharpness", 0xA40A}, - {"DeviceSettingDescription", 0xA40B}, - {"SubjectDistanceRange", 0xA40C} -// {"InteroperabilityIndex", 0x1}, // <- Table 13 Interoperability IFD Attribute Information -// {"", 0x0} -}; - /** Recursively decodes all IFD's and * adds included TAGS into the metadata dictionary. */ int avpriv_exif_decode_ifd(void *logctx, const uint8_t *buf, int size,