From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 7869D4C7A5 for ; Mon, 15 Sep 2025 18:23:57 +0000 (UTC) Authentication-Results: ffbox; dkim=fail (body hash mismatch (got b'qlUNyKu9gkVOCX6TMWnkKm7pQfTWZJr0wjpBG6TFI9Y=', expected b'VKxcCgwFSOM790vzm5g758PMoCncikDkQHHPOTCK0W0=')) header.d=ffmpeg.org header.i=@ffmpeg.org header.a=rsa-sha256 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1757960628; h=mime-version : to : date : message-id : reply-to : subject : list-id : list-archive : list-archive : list-help : list-owner : list-post : list-subscribe : list-unsubscribe : from : cc : content-type : content-transfer-encoding : from; bh=qlUNyKu9gkVOCX6TMWnkKm7pQfTWZJr0wjpBG6TFI9Y=; b=UxwuBjWgcOzZzBcf6AwaWwnpfu1IUGdEXEGheZlDCVZ3A6tO9+yzsYro6+r3xlZVtZVHR Gxp2AlPAYYtxt7awqJub2YsgJGXA6BYHTjoxcG7zbDvG2JRf8h1UTPSsOI2HGyGfU52XHyp 6FGo62xISEBJb70uXAQm7VAPvD6VSQGbMDaMwZM8+60C/hzYUAkilpB7MFq3oACAOO7/mSR Z6WPKoESMm8RIaGMxdJISlaEewmbGv66OqeE4KOMsfX0nvrmMh7tiUErrl3bhr4OeaHuVIN uc6M+VXLvxqnav2Sv3NgF+A7vkMx7znzuuCOW5miD3SxSSux++Z3YNewK2Gw== Received: from [172.19.0.4] (unknown [172.19.0.4]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 77F4968E920; Mon, 15 Sep 2025 21:23:48 +0300 (EEST) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=ffmpeg.org; s=arc; t=1757960627; b=EeaWnZQNYBeyiIWI3Nm7GwtzwG/djANhC1bODWU1qPkBOh7u+lTc+LUxYKaEhf45dkmmR S46sEebZLhcAkUpdzCM+gWnhRDPI55dJ5aCskSMIv1sjFfNxMiZQ+IEWyyux4hKHKxfKO5g GFobW8EE1QM/tXB8Sy03WzLuwu1ujhXGhagTTAVVYkSYh7IgnnK5tVXgrB+3OUW/Xhxzp7H is7XzRbMd4NJDk6DWyoy2Slz0F/MFflhY9AP2LU/GqMqiFs0IF9s41sBxA/+0myfblM8M+v GEhHr1UG6GAQAYtrIpEsnBE2ocIDvEPh81/Udfbq+Nb5sZM3zXrFPpBsB1Zg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=ffmpeg.org; s=arc; t=1757960627; h=from : sender : reply-to : subject : date : message-id : to : cc : mime-version : content-type : content-transfer-encoding : content-id : content-description : resent-date : resent-from : resent-sender : resent-to : resent-cc : resent-message-id : in-reply-to : references : list-id : list-help : list-unsubscribe : list-subscribe : list-post : list-owner : list-archive; bh=XLtF3zUUQLcCFUhvx7G3jA9QspeSvb6tEmjzK44/2Mo=; b=enp3MG3PfLzGsxIhQAreR4CIyWJAfvtw/5R4p6fEm5tZ47046ld56cSCIBNpYJCbfUPs9 ToAlTKXW6QUJtMNPhsLw+u552yohgz5sa+8S9j7z56p9KTWcueeRdEPkhSegGbJlTH3YUmI 9yA3Ow91MKg8Mde/wZQR3vwkA94H+uLM+4F5cxxbxMlZQYj+bH8TxJnS92CZUBF9wsfDUN5 m9lVIuJoBimDxd7dprmI4OztZhOUKxh9c999tSlYDjzZUsZ01JbbZ4lNvoauPaeP8H3/xQw UB77FpnTQXglFbFYCAJPpJJuQIFid5KMAvHFNte3Ezvv5RVU8q+qDVRJ7Yzw== ARC-Authentication-Results: i=1; ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none; dmarc=none Authentication-Results: ffmpeg.org; dkim=pass header.d=ffmpeg.org header.i=@ffmpeg.org; arc=none (Message is not ARC signed); dmarc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ffmpeg.org; i=@ffmpeg.org; q=dns/txt; s=mail; t=1757960619; h=content-type : mime-version : content-transfer-encoding : from : to : reply-to : subject : date : from; bh=VKxcCgwFSOM790vzm5g758PMoCncikDkQHHPOTCK0W0=; b=OWeBiyEKv2sYy2UpNRlUjXZrkErb+9JVFvSEfliFIf2b9ogOPPhaZc85gBvlSNa2dWXgD FkhDKHzWmE5APTFdL8Q3PIbek4HwCKHEhi/spbsfp6EOzBzHTw2Q5qnpDdBGUZCzDqzCscC fm2opvyI9kvlQ3iyx9+/zFaxvxZTpQK3UPs+0tlNhEBDcVEebeYTqMAu6bTmLfuVFVQ/hKA YYlPxjjRd/A8p1zv/i1zFq9sjVsVolHHMaFjLHI2vvR7IVJMgZmTivVyGjceo2JBUDHlbp8 Za4m11BQJLWVWTavcBFNQ8F9vXmlh7H1m1xUCKTmNQzJke736+uvYBGvhusA== Received: from ed19c606a818 (code.ffmpeg.org [188.245.149.3]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id E0EFC68CC7C for ; Mon, 15 Sep 2025 21:23:39 +0300 (EEST) MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Date: Mon, 15 Sep 2025 18:23:39 -0000 Message-ID: <175796062001.25.7405766153003853208@463a07221176> Message-ID-Hash: VURDBIB7GHJ2V25BR4Q3LZ6QHT3ZGX7C X-Message-ID-Hash: VURDBIB7GHJ2V25BR4Q3LZ6QHT3ZGX7C X-MailFrom: code@ffmpeg.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-ffmpeg-devel.ffmpeg.org-0; header-match-ffmpeg-devel.ffmpeg.org-1; header-match-ffmpeg-devel.ffmpeg.org-2; header-match-ffmpeg-devel.ffmpeg.org-3; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list Reply-To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH] avcodec/decode: Inline EXIF Orientation tag value (PR #20530) List-Id: FFmpeg development discussions and patches Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: mkver via ffmpeg-devel Cc: mkver Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Archived-At: List-Archive: List-Post: PR #20530 opened by mkver URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20530 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/20530.patch >>From 2438cd28d45abb2d100f6b672f0e558e807a6714 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Mon, 15 Sep 2025 20:10:05 +0200 Subject: [PATCH] avcodec/decode: Inline EXIF Orientation tag value Signed-off-by: Andreas Rheinhardt --- libavcodec/decode.c | 3 ++- libavcodec/exif.c | 5 ++--- libavcodec/exif_internal.h | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/libavcodec/decode.c b/libavcodec/decode.c index ae86e270df..3d9b91a228 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -48,6 +48,7 @@ #include "codec_internal.h" #include "decode.h" #include "exif.h" +#include "exif_internal.h" #include "hwaccel_internal.h" #include "hwconfig.h" #include "internal.h" @@ -2360,7 +2361,7 @@ static int exif_attach_ifd(AVCodecContext *avctx, AVFrame *frame, const AVExifMe for (size_t i = 0; i < ifd->count; i++) { const AVExifEntry *entry = &ifd->entries[i]; - if (entry->id == av_exif_get_tag_id("Orientation") && + if (entry->id == EXIF_ORIENTATION_TAG && entry->count > 0 && entry->type == AV_TIFF_SHORT) { orient = entry; break; diff --git a/libavcodec/exif.c b/libavcodec/exif.c index f9ad3e1bdb..5c9a84420d 100644 --- a/libavcodec/exif.c +++ b/libavcodec/exif.c @@ -47,7 +47,6 @@ #define EXIF_TAG_NAME_LENGTH 32 #define MAKERNOTE_TAG 0x927c -#define ORIENTATION_TAG 0x112 #define EXIFIFD_TAG 0x8769 #define IMAGE_WIDTH_TAG 0x100 #define IMAGE_LENGTH_TAG 0x101 @@ -1250,7 +1249,7 @@ int ff_exif_sanitize_ifd(void *logctx, const AVFrame *frame, AVExifMetadata *ifd for (size_t i = 0; i < ifd->count; i++) { AVExifEntry *entry = &ifd->entries[i]; - if (entry->id == ORIENTATION_TAG && entry->count > 0 && entry->type == AV_TIFF_SHORT) { + if (entry->id == EXIF_ORIENTATION_TAG && entry->count > 0 && entry->type == AV_TIFF_SHORT) { or = entry; continue; } @@ -1300,7 +1299,7 @@ int ff_exif_sanitize_ifd(void *logctx, const AVFrame *frame, AVExifMetadata *ifd } if (!or && orientation != 1) { rewrite = 1; - ret = av_exif_set_entry(logctx, ifd, ORIENTATION_TAG, AV_TIFF_SHORT, 1, NULL, 0, &orientation); + ret = av_exif_set_entry(logctx, ifd, EXIF_ORIENTATION_TAG, AV_TIFF_SHORT, 1, NULL, 0, &orientation); if (ret < 0) goto end; } diff --git a/libavcodec/exif_internal.h b/libavcodec/exif_internal.h index c0d2b3ef62..6c3ae3becb 100644 --- a/libavcodec/exif_internal.h +++ b/libavcodec/exif_internal.h @@ -36,6 +36,8 @@ #include "exif.h" #include "version_major.h" +#define EXIF_ORIENTATION_TAG 0x112 + #if LIBAVCODEC_VERSION_MAJOR < 63 /* Used by the AVI demuxer */ int avpriv_exif_decode_ifd(void *logctx, const uint8_t *buf, int size, -- 2.49.1 _______________________________________________ ffmpeg-devel mailing list -- ffmpeg-devel@ffmpeg.org To unsubscribe send an email to ffmpeg-devel-leave@ffmpeg.org