MKA : Properly read files whose first Cluster doesn't start at Timest…

…amp 0 [#310]
Zeugma440 · Feb 3, 2025 · 4918f2e · 4918f2e
1 parent b8066fd
commit 4918f2e
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/ATL/AudioData/IO/MKA.cs b/ATL/AudioData/IO/MKA.cs
@@ -404,18 +404,25 @@ private bool readPhysicalData(EBMLReader reader)
 
             // Find AudioDataOffset using Clusters' timecodes
             reader.seek(segmentOffset);
-            // Cluster with Timecode 0
+            // Seek Cluster with Timecode 0
             crits = new HashSet<Tuple<long, int>>
             {
                 new Tuple<long, int>(ID_TIMESTAMP, 0), // Timestamp
             };
-            res = reader.seekElement(ID_CLUSTER, crits); // Cluster
+            res = reader.seekElement(ID_CLUSTER, crits);
             if (res != EBMLReader.SeekResult.FOUND_MATCH)
             {
                 LogDelegator.GetLogDelegate()(Log.LV_WARNING, "Couldn't locate Cluster for timestamp 0");
-                return false;
+                // Seek first cluster instead
+                reader.seek(segmentOffset);
+                if (!reader.seekElement(ID_CLUSTER))
+                {
+                    LogDelegator.GetLogDelegate()(Log.LV_WARNING, "Couldn't locate any Cluster!");
+                    return false;
+                }
             }
-            long zeroClusterOffset = reader.Position;
+
+            long firstClusterOffset = reader.Position;
 
             long blockAudioSize = -1;
             while (-1 == AudioDataOffset)
@@ -440,7 +447,7 @@ private bool readPhysicalData(EBMLReader reader)
                 else break;
             }
 
-            reader.seek(zeroClusterOffset);
+            reader.seek(firstClusterOffset);
             while (-1 == AudioDataOffset)
             {
                 if (reader.seekElement(ID_SIMPLEBLOCK)) // SimpleBlock