Mimic Exif hierarchy in CRX

MetadataExtractor/Formats/QuickTime/QuickTimeMetadataReader.cs

@@ -72,34 +72,34 @@ static void SetRotation(QuickTimeTrackHeaderDirectory directory)
                 }
             }
 
-            void UuidHandler(AtomCallbackArgs a)
+            void CrxUuidHandler(AtomCallbackArgs a)
             {
                 switch (a.TypeString)
                 {
                     case "CMT1":
                     {
-                        var handler = new QuickTimeTiffHandler<ExifIfd0Directory>(directories);
+                        var handler = new ExifTiffHandler(directories);
                         var reader = new IndexedSeekingReader(a.Stream, (int)a.Reader.Position);
                         TiffReader.ProcessTiff(reader, handler);
                         break;
                     }
                     case "CMT2":
                     {
-                        var handler = new QuickTimeTiffHandler<ExifSubIfdDirectory>(directories);
+                        var handler = new QuickTimeTiffHandler<ExifSubIfdDirectory, ExifIfd0Directory>(directories);
                         var reader = new IndexedSeekingReader(a.Stream, (int)a.Reader.Position);
                         TiffReader.ProcessTiff(reader, handler);
                         break;
                     }
                     case "CMT3":
                     {
-                        var handler = new QuickTimeTiffHandler<CanonMakernoteDirectory>(directories);
+                        var handler = new QuickTimeTiffHandler<CanonMakernoteDirectory, ExifSubIfdDirectory>(directories);
                         var reader = new IndexedSeekingReader(a.Stream, (int)a.Reader.Position);
                         TiffReader.ProcessTiff(reader, handler);
                         break;
                     }
                     case "CMT4":
                     {
-                        var handler = new QuickTimeTiffHandler<GpsDirectory>(directories);
+                        var handler = new QuickTimeTiffHandler<GpsDirectory, ExifIfd0Directory>(directories);
                         var reader = new IndexedSeekingReader(a.Stream, (int)a.Reader.Position);
                         TiffReader.ProcessTiff(reader, handler);
                         break;
@@ -137,11 +137,14 @@ void MoovHandler(AtomCallbackArgs a)
                     }
                     case "uuid":
                     {
-                        var CR3 = new byte[] { 0x85, 0xc0, 0xb6, 0x87, 0x82, 0x0f, 0x11, 0xe0, 0x81, 0x11, 0xf4, 0xce, 0x46, 0x2b, 0x6a, 0x48 };
-                        var uuid = a.Reader.GetBytes(CR3.Length);
-                        if (CR3.RegionEquals(0, CR3.Length, uuid))
+                        var CRX = new byte[] { 0x85, 0xc0, 0xb6, 0x87, 0x82, 0x0f, 0x11, 0xe0, 0x81, 0x11, 0xf4, 0xce, 0x46, 0x2b, 0x6a, 0x48 };
+                        if (a.BytesLeft >= CRX.Length)
                         {
-                            QuickTimeReader.ProcessAtoms(stream, UuidHandler, a.BytesLeft);
+                            var uuid = a.Reader.GetBytes(CRX.Length);
+                            if (CRX.RegionEquals(0, CRX.Length, uuid))
+                            {
+                                QuickTimeReader.ProcessAtoms(stream, CrxUuidHandler, a.BytesLeft);
+                            }
                         }
                         break;
                     }

MetadataExtractor/Formats/QuickTime/QuickTimeTiffHandler.cs

@@ -4,11 +4,13 @@
 using MetadataExtractor.Formats.Exif;
 using MetadataExtractor.Formats.Tiff;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace MetadataExtractor.Formats.QuickTime
 {
-    public sealed class QuickTimeTiffHandler<T> : ExifTiffHandler
+    public sealed class QuickTimeTiffHandler<T, TParent> : ExifTiffHandler
         where T : Directory, new()
+        where TParent : Directory
     {
         public QuickTimeTiffHandler([NotNull] List<Directory> directories)
             : base(directories)
@@ -22,7 +24,11 @@ public override void SetTiffMarker(int marker)
             {
                 throw new TiffProcessingException($"Unexpected TIFF marker: 0x{marker:X}");
             }
-            PushDirectory(new T());
+            var directory = new T
+            {
+                Parent = Directories.OfType<TParent>().SingleOrDefault()
+            };
+            PushDirectory(directory);
         }
     }
 }