From patchwork Tue Feb 13 21:24:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Izen X-Patchwork-Id: 35061 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c493:b0:19e:cdac:8cce with SMTP id eo19csp1381pzb; Tue, 13 Feb 2024 13:25:29 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCX2FKsa8iKteXpok24pfZQZA4dRZADqtqKF5O9bIerZrqJH5gfrFPt+EXwG4hE62i1iBB9CLx02R+4xm5lPsJ9loFG5I6ILNlCmyQ== X-Google-Smtp-Source: AGHT+IEUhzPEMdZGwcg+eb8ggjvncYcvGLIQ+hKF0e8556PVRes41tsCDkR+ZmeLnudMW/lWxfET X-Received: by 2002:a05:6402:1491:b0:560:10c:3cc with SMTP id e17-20020a056402149100b00560010c03ccmr626382edv.21.1707859528474; Tue, 13 Feb 2024 13:25:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1707859528; cv=none; d=google.com; s=arc-20160816; b=QWCJiaZMtFLamCydX4r4o2Quo7r4X9IRE24DElWHL3IGInaLL/Qr6pUIb6vr2r8R70 4ADIdH677pEtLbvl0VGT22kaioIaagMp2L9zmJzslNm1nhmGoNjwu+RBQupKLnqCzzIO Ig/VU1XRjO04WzaK7KkHn2bMtueKNErzp2Fv2FVlQA8RHmMkBcXX38XaWKouVRsage4v OJPCdrvWfCu0IGEmrSCgDtf+Jy0z1wRZE9+v8Qji4Y3z+ROmB8ITaOuRQBODb60NqHaI KPzbh+4EraLujludDafL0S77W/DiHbpl0Ft5VvPcBvRY7e+sKVFWoD6oJHXbx3QKDevd D4lg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=PLe9hQXGb5dBg8XIR5WOuFUSmi7RIyAO+8328iKZVYk=; fh=eyKIBFzocuUleGVYiqUhF84uTYXjQHLjBLed587bzdw=; b=IXHOOBK0rKDq+uNX+6nMNf2e2i3Lsp+idod0v3n+05CoF07sPJxKgbBLcicwcR+MzH +TPfUJjuAO4Ej6bq1avwPDzNjOZR9bHC/x4cGJhVaMePxDATRLAgICP66qw5VCayLvmA 5lk9Ph8WVHmSVULIyDG3jU0sUN3Qu4G7wRy+X6xV/ixSzV2ksRK79jwxLHVfG+3RCBm+ UrV03uKt3jxZ6dfZ4zSN+OduLBTDxs5GDnv8JICBbVNmBhY1PIjC8DQ6P/YoawvFjcRg wPOyxDqGO8VxR+MwZjpkBz1LFNBEmJnCG5610Ne6XQUDGIlX0RFlRulnVV/XsfOil2xu X/rw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=Z1LY9IRh; 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=gmail.com X-Forwarded-Encrypted: i=1; AJvYcCWdIR4iyTk40fqUdp3vK0yaNmuvCVQUetc15q2m6UobxjCYhCTDvgZZEwvlSn56A9mXv7g/8N/XsiGUeyNxu5FGUmFP3eCJwS1i+45c5kUx0PEU9jcSoNNyZw8givOZ443oAmGlRYv5WhGyaqaZz/sLvefkEob6n0mwbhfniI+Aj/+Vo85qmT7czVypsor5DHtGiYURlNb5Z4egleplph0XOcOHlHj6fWoD3Hf1Tv4Lt4j9A5ayFYilLCProxSIxU9csnYTF/83Gw0ClX2ZZtU8Z9ac7pRY+7OqVfu28kAeE2XXHSxSuE7AWLyBejvvkUionskSbGX2ecXYNQBpSvqPcxFBLjTwdm5QWKL3g/9VrK0zRbS8TZ0bcmydslfkxLmKaXesEIlbRnCDc2M2cSSdtzrGltdZikXke9SvOGkXHvwMpKRac7TDYBr+O/H7tCo1U/v4Mf5UFGkyRSVkMfQpowVW57CGVtX0ufLXRqf72d31ys+FmFHGUT4+EfuGu8zYilyptCyQlYknOH8IX9aHUCDpOxSUkxjgmn+sYAUfudVq96lXbLgFn9+Pv51NxxlnVc3MBREPbrqDiFiKh3BC3FmtnBF85Maq1y/1eSIaehVa13geNqoQJFxYjhMSumItexpQdpvpZheHqv8Mrrmq214qiW7MymQ95JVECToMt9LqccN72E3ZaNXjKVrc4FyCMkDr7RW+tZ1zusSRW203ki5A7VZ4DPQ3EDZxSO5scuxTjNw4OgQ3SAlSvcFeJtmPh7kom0cvyhSE7Lb82ArNGsasn7FBxNROhWF/AwtFvTZUe8z5sm5jM0EowiOhmOsxo3/A3RZjMBfJTpSvx8nKQlx+YGA7OyXz0nGOHtRtt4F22x7bbQUs3el9g00jSjAmBs49bSQLhixc9lZV3oxssx+XRsIPVc55KZgGh8XoF8OT7MHm+P0Gsaa715bsHNwL83 rNj6ew1esUslmBrpmPCCMX2u6Y2ZGp/wO8AjEmt8UHBDKpT/VPA51Awz6Xq1ktLzsbcAMj5ITKSUPK2cN2toSnqWUiHSzd+LgiI4d7IOqaPLlhRUDIHtru/VjNHdmpeC5vsQSiX7wRZVtDSOFyxW1qx5nPOZIcnjvQWCpS33Jt6FpWWLfKCYMNjpT/Kc0hUV8Rf9k2tXKMLr5HoX6O9wWf8b9gYvNx6hbXOB2D49b1fmyd791HuLi74E3Fi4RubAc0XkXxsHcWDmmhYmk3GdgTjLrbv1n7Smdb5Qt4ZqFVuvOLb0APMMPGT6uSkOLX0cfLHoagi7FCIhBYNUxzLHFb7YBcj+8vVrL1kaS41FtePHdUamsIvlLoCiDAiDaaiUvtB0SImIO9A5Z0EzzVE8YUFrXGArgEbarfGwZiAiG/a5FBV3tR7Iw2hkxZzEEvkO+bK9MRu46T27i7tlwg3YSiBCWYOxrasn0KutD8ENry/jDFj7U+lVImLcYuelZBaNnOAoolHf9T11ippeEQg5mXr/XnEK/3JtkRvKNJA1+dfo4lbFxPuUCNWKokDUQ+unUWiNlEFXE4mc1IoYd+zJi4M1G9/rVS Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id w12-20020aa7cb4c000000b005615b840203si4168535edt.513.2024.02.13.13.25.12; Tue, 13 Feb 2024 13:25:28 -0800 (PST) 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=@gmail.com header.s=20230601 header.b=Z1LY9IRh; 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=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E5C3E68D184; Tue, 13 Feb 2024 23:25:07 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f175.google.com (mail-qt1-f175.google.com [209.85.160.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D531A68C4E1 for ; Tue, 13 Feb 2024 23:25:00 +0200 (EET) Received: by mail-qt1-f175.google.com with SMTP id d75a77b69052e-4280f3ec702so16642491cf.0 for ; Tue, 13 Feb 2024 13:25:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1707859499; x=1708464299; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=Da+xwfknKqndqCtG6NDQxrspQugaQCaI/+cPYHi03CI=; b=Z1LY9IRhdiiNM2eXbdSwBkD/e7biL7yi73NuOHOj6Wcp3Sq86ukcsQiVuJnW4QkJT2 xphDiJjjPpeVhn8crE8An3IAWSJ3U9pzBdFJrWa25x/+d05dA3eRDn3nlSlvbVORumHE 5Xa7CplQ09KxI/UpvtMyLTrFD57nnhSZCbU/7icjDszU4xDgjlkQVzactFxxe/KnjLe6 ViX6hofzORHpeJu95I4iH3MfG6YnH4ep/fm/Za+hUGnBwxSkeW+JEiqj9ObRYBOWBvEX sOTJMtIm2XQXfw08PV+zRMs2YkhXyfJfCQPIHuBXiesXkZIf4hUX3phZ2pOG7lfQkSvt cQvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707859499; x=1708464299; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Da+xwfknKqndqCtG6NDQxrspQugaQCaI/+cPYHi03CI=; b=uylFZ1vj8am+CxhC5WOYc/IFXnWDNykENd3VME+UFqiDoZZs3QCTONoNcsUVB+GJvQ Y53SxRG/Dd7+jrLyLUWVsoPwQ6OAKcgERfX/XLIfd7VM7gk3N1HkY5sBbZPAVdtR6mjr 1Hzc4pTLMbNWBwu5q6YT48XToClkYeL0MZQ6iLBmcLON9FUPoWJN+hXF15aOb8mPu/so SCyHCxiqiZJMOwFZJNr1SDCwH6vJQgLtUOHtwCpoC6MykRdVGBpkjmK+fH25Y4VTNvBf C/hBPZtTJq2ba6GZHtlLggIADRgJV6i4wLv9LJY5ZBURepzPo9Z9r77+Bd7B98eXk38x q20w== X-Gm-Message-State: AOJu0YzyhPbhw2wYs7ePr76z6oqYOb2TA5b0bX8dv4QLFBb8NAerHClG /zvksT9FwPOXeT3f65pvY3XlqNTr6IwtagOuANXyg5sXNVmScOm2nLIOgna0 X-Received: by 2002:a05:620a:6190:b0:785:bd4d:e219 with SMTP id or16-20020a05620a619000b00785bd4de219mr227560qkn.4.1707859498725; Tue, 13 Feb 2024 13:24:58 -0800 (PST) Received: from gauss.local (c-68-56-149-176.hsd1.mi.comcast.net. [68.56.149.176]) by smtp.gmail.com with ESMTPSA id g5-20020a37e205000000b007861bea2972sm1523016qki.6.2024.02.13.13.24.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Feb 2024 13:24:58 -0800 (PST) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Tue, 13 Feb 2024 16:24:53 -0500 Message-ID: <20240213212456.167386-1-leo.izen@gmail.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 0/3] [RFC] EXIF overhaul 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: Leo Izen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: iqcmkW0f/YII A few notes: - This includes an avpriv_ removal, so it won't be able to be merged until the ABI is bumped. Alternatively, I could add that avipriv_ back in as a wrapper around the actual API so it's not a blocker, and then we can remove it when the time comes to bump the ABI. - MakerNote inside TIFF files are not handled by this patch. I don't have any samples that lets me reliably special-case them based on manufacturer. MakerNote is, by spec, a binary blob, but in practice it's often a TIFF IFD, with arbitrary data before the IFD starts and arbitrary semantics on whether its IFD-offsets are relative to the start of the TIFF header or the start of the MakerNote. The lack of samples makes this hard to work around. See [1] for more details. Note that [1] links [2] but [2] is a deadlink. - We attach the EXIF buffer as-is from mjpeg, webp, or other files that treat it as a blob, but we still need to parse it in order to determine the display matrix orientation side data. If there's a better way to handle this, please suggest one. - AVFrameSideData must be flat, so we can't parse it and store an AVDictionary * pointer in its place, as convenient as that would be. [1] https://exiv2.org/makernote.html [2] http://www.exif.org/samples.html Leo Izen (3): various: change EXIF metadata into AVFrameSideData avcodec/pngdec: parse eXIf chunk avcodec/pngenc: write eXIf chunks fftools/ffprobe.c | 27 ++- libavcodec/Makefile | 1 + libavcodec/exif.c | 267 +++++++++++++++++++++++++++-- libavcodec/exif.h | 21 ++- libavcodec/exif_internal.h | 41 +++++ libavcodec/mjpegdec.c | 96 ++--------- libavcodec/mjpegdec.h | 2 +- libavcodec/pngdec.c | 35 ++++ libavcodec/pngenc.c | 4 + libavcodec/tiff.c | 19 +- libavcodec/tiff.h | 1 + libavcodec/webp.c | 38 ++-- libavformat/avidec.c | 4 +- libavutil/frame.c | 1 + libavutil/frame.h | 6 + tests/ref/fate/exif-image-embedded | 5 +- tests/ref/fate/exif-image-jpg | 91 +++++----- tests/ref/fate/exif-image-webp | 91 +++++----- 18 files changed, 521 insertions(+), 229 deletions(-) create mode 100644 libavcodec/exif_internal.h