From a13505bbe2057a9807dce19bad33b2a289dbc0bc Mon Sep 17 00:00:00 2001
From: GonnaHackIt <dawid6289@gmail.com>
Date: Mon, 13 May 2024 21:48:33 +0200
Subject: [PATCH] mkv: fix seeking error

---
 symphonia-format-mkv/src/demuxer.rs | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/symphonia-format-mkv/src/demuxer.rs b/symphonia-format-mkv/src/demuxer.rs
index ddab18e5..42f0e77b 100644
--- a/symphonia-format-mkv/src/demuxer.rs
+++ b/symphonia-format-mkv/src/demuxer.rs
@@ -180,11 +180,20 @@ impl MkvReader {
                 target_block = Some(block);
             }
 
-            let pos = match target_block {
-                Some(block) => block.pos,
-                None => cluster.pos,
+            let (seek_ts, pos) = match target_block {
+                Some(block) => (block.timestamp, block.pos),
+                None => (cluster.timestamp, cluster.pos),
             };
-            self.iter.seek(pos)?;
+
+            match self.frames.front() {
+                Some(frame) => {
+                    // skip internal seeking if the target timestamp is in the current block/cluster
+                    if seek_ts > frame.timestamp || ts < frame.timestamp {
+                        self.iter.seek(pos)?;
+                    }
+                }
+                None => self.iter.seek(pos)?,
+            }
 
             // Restore cluster's metadata
             self.current_cluster =