From fcb3066950f79c61490c29a3fcfc9e58b62d461f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milo=C5=A1=20Komar=C4=8Devi=C4=87?= Date: Thu, 11 Mar 2021 22:30:03 +0100 Subject: [PATCH 1/2] Include a few more BMFF major brands --- src/bmffimage.cpp | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/bmffimage.cpp b/src/bmffimage.cpp index bd3ebcb9..a76c9a1f 100644 --- a/src/bmffimage.cpp +++ b/src/bmffimage.cpp @@ -52,9 +52,14 @@ struct BmffBoxHeader #define TAG_ftyp 0x66747970 /**< "ftyp" File type box */ #define TAG_avif 0x61766966 /**< "avif" AVIF */ +#define TAG_avio 0x6176696f /**< "avio" AVIF */ +#define TAG_avis 0x61766973 /**< "avis" AVIF */ #define TAG_heic 0x68656963 /**< "heic" HEIC */ #define TAG_heif 0x68656966 /**< "heif" HEIF */ -#define TAG_crx 0x63727820 /**< "crx " Canon CR3 */ +#define TAG_heim 0x6865696d /**< "heim" HEIC */ +#define TAG_heis 0x68656973 /**< "heis" HEIC */ +#define TAG_heix 0x68656978 /**< "heix" HEIC */ +#define TAG_crx 0x63727820 /**< "crx " Canon CR3 */ #define TAG_moov 0x6d6f6f76 /**< "moov" Movie */ #define TAG_meta 0x6d657461 /**< "meta" Metadata */ #define TAG_mdat 0x6d646174 /**< "mdat" Media data */ @@ -132,8 +137,13 @@ namespace Exiv2 { switch (fileType_) { case TAG_avif: + case TAG_avio: + case TAG_avis: return "image/avif"; case TAG_heic: + case TAG_heim: + case TAG_heis: + case TAG_heix: return "image/heic"; case TAG_heif: return "image/heif"; From f95d97a0bfb614ff13a0439d97ca5e536e834ce9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milo=C5=A1=20Komar=C4=8Devi=C4=87?= Date: Fri, 12 Mar 2021 09:20:14 +0100 Subject: [PATCH 2/2] Add mif1 brand to heif mime type --- src/bmffimage.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/bmffimage.cpp b/src/bmffimage.cpp index a76c9a1f..b9ad9436 100644 --- a/src/bmffimage.cpp +++ b/src/bmffimage.cpp @@ -59,6 +59,7 @@ struct BmffBoxHeader #define TAG_heim 0x6865696d /**< "heim" HEIC */ #define TAG_heis 0x68656973 /**< "heis" HEIC */ #define TAG_heix 0x68656978 /**< "heix" HEIC */ +#define TAG_mif1 0x6d696631 /**< "mif1" HEIF */ #define TAG_crx 0x63727820 /**< "crx " Canon CR3 */ #define TAG_moov 0x6d6f6f76 /**< "moov" Movie */ #define TAG_meta 0x6d657461 /**< "meta" Metadata */ @@ -146,6 +147,7 @@ namespace Exiv2 case TAG_heix: return "image/heic"; case TAG_heif: + case TAG_mif1: return "image/heif"; case TAG_crx: return "image/x-canon-cr3";