M4A/MP4 : Improve duration detection for fragmented MP4s

Zeugma440 · Jan 23, 2025 · 2267f39 · 2267f39
1 parent 2477295
commit 2267f39
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/ATL/AudioData/IO/MP4.cs b/ATL/AudioData/IO/MP4.cs
@@ -647,11 +647,9 @@ private void readMoof(Stream s)
                 if (s.Read(data, 0, 4) < 4) break;
                 var mdatSize = StreamUtils.DecodeBEUInt32(data);
                 s.Seek(mdatSize - 4, SeekOrigin.Current);
-                if (s.Read(data, 0, 4) < 4) break;
-                moofSize = StreamUtils.DecodeBEUInt32(data);
-                if (s.Read(data, 0, 4) < 4) break;
-                var atomName = Utils.Latin1Encoding.GetString(data);
-                if (!atomName.Equals("moof")) break;
+
+                // Look for the next moof atom; other atoms may exist between successive moof atoms
+                moofSize = navigateToAtom(s, "moof");
             }
 
             calculatedDurationMs = durationAll * 1000.0 / SampleRate;