added avif support & renamed heic.mjs -> heif.mjs

MikeKovarik · May 6, 2021 · d0ac78b · d0ac78b
1 parent e03e5a5
commit d0ac78b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/src/bundles/full.mjs b/src/bundles/full.mjs
@@ -9,7 +9,7 @@ import '../file-readers/Base64Reader.mjs'
 
 // File Parsers
 import '../file-parsers/tiff.mjs'
-import '../file-parsers/heic.mjs'
+import '../file-parsers/heif.mjs'
 import '../file-parsers/png.mjs'
 
 // TIFF - Additional tags

diff --git a/src/bundles/lite.mjs b/src/bundles/lite.mjs
@@ -9,7 +9,7 @@ import '../file-readers/BlobReader.mjs'
 
 // File Parser
 import '../file-parsers/jpeg.mjs'
-import '../file-parsers/heic.mjs'
+import '../file-parsers/heif.mjs'
 
 // TIFF Parser
 import '../segment-parsers/tiff-exif.mjs'

diff --git a/src/file-parsers/heic.mjs → src/file-parsers/heif.mjs b/src/file-parsers/heic.mjs → src/file-parsers/heif.mjs
@@ -55,9 +55,7 @@ export class IsoBmffParser extends FileParserBase {
 
 }
 
-export class HeicFileParser extends IsoBmffParser {
-
-	static type = 'heic'
+export class HeifFileParser extends IsoBmffParser {
 
 	// NOTE: most parsers check if bytes 4-8 are 'ftyp' and then if 8-12 is one of heic/heix/hevc/hevx/heim/heis/hevm/hevs/mif1/msf1
 	//       but bytes 20-24 are actually always 'heic' for all of these formats
@@ -73,7 +71,7 @@ export class HeicFileParser extends IsoBmffParser {
 			compatibleBrands.push(file.getString(offset, 4))
 			offset += 4
 		}
-		return compatibleBrands.includes('heic')
+		return compatibleBrands.includes(this.type)
 	}
 
 	async parse() {
@@ -207,4 +205,13 @@ export class HeicFileParser extends IsoBmffParser {
 
 }
 
-fileParsers.set('heic', HeicFileParser)
+export class HeicFileParser extends HeifFileParser {
+	static type = 'heic'
+}
+
+export class AvifFileParser extends HeifFileParser {
+	static type = 'avif'
+}
+
+fileParsers.set('heic', HeicFileParser)
+fileParsers.set('avif', AvifFileParser)