--- a/media/mp4parse-rust/mp4parse_capi/src/lib.rs
+++ b/media/mp4parse-rust/mp4parse_capi/src/lib.rs
@@ -821,43 +821,58 @@ struct SampleToChunkIterator<'a> {
 }
 
 impl<'a> Iterator for SampleToChunkIterator<'a> {
     type Item = (u32, u32);
 
     fn next(&mut self) -> Option<(u32, u32)> {
         let has_chunk = self.chunks.next()
             .or_else(|| {
-                self.chunks = match (self.stsc_peek_iter.next(), self.stsc_peek_iter.peek()) {
-                    (Some(next), Some(peek)) if next.first_chunk > 0 && peek.first_chunk > 0 => {
-                        self.sample_count = next.samples_per_chunk;
-                        ((next.first_chunk - 1) .. (peek.first_chunk - 1))
-                    },
-                    (Some(next), None) if next.first_chunk > 0 => {
-                        self.sample_count = next.samples_per_chunk;
-                        // Total chunk number in 'stsc' could be different to 'stco',
-                        // there could be more chunks at the last 'stsc' record.
-                        match next.first_chunk.checked_add(self.remain_chunk_count) {
-                            Some(r) => ((next.first_chunk - 1) .. r - 1),
-                            _ => (0 .. 0),
-                        }
-                    },
-                    _ => (0 .. 0),
-                };
-
+                self.chunks = self.locate();
                 self.remain_chunk_count.checked_sub(self.chunks.len() as u32).and_then(|res| {
                     self.remain_chunk_count = res;
                     self.chunks.next()
                 })
             });
 
         has_chunk.map_or(None, |id| { Some((id, self.sample_count)) })
     }
 }
 
+impl<'a> SampleToChunkIterator<'a> {
+    fn locate(&mut self) -> std::ops::Range<u32> {
+        loop {
+            let r = match (self.stsc_peek_iter.next(), self.stsc_peek_iter.peek()) {
+                (Some(next), Some(peek)) if next.first_chunk == peek.first_chunk => {
+                    // Invalid entry, skip it and will continue searching at
+                    // next loop iteration.
+                    None
+                },
+                (Some(next), Some(peek)) if next.first_chunk > 0 && peek.first_chunk > 0 => {
+                    self.sample_count = next.samples_per_chunk;
+                    Some((next.first_chunk - 1) .. (peek.first_chunk - 1))
+                },
+                (Some(next), None) if next.first_chunk > 0 => {
+                    self.sample_count = next.samples_per_chunk;
+                    // Total chunk number in 'stsc' could be different to 'stco',
+                    // there could be more chunks at the last 'stsc' record.
+                    match next.first_chunk.checked_add(self.remain_chunk_count) {
+                        Some(r) => Some((next.first_chunk - 1) .. r - 1),
+                        _ => Some(0 .. 0),
+                    }
+                },
+                _ => Some(0 .. 0)
+            };
+            if r.is_some() {
+                return r.unwrap();
+            }
+        };
+    }
+}
+
 fn create_sample_table(track: &Track, track_offset_time: i64) -> Option<Vec<Mp4parseIndice>> {
     let timescale = match track.timescale {
         Some(ref t) => TrackTimeScale::<i64>(t.0 as i64, t.1),
         _ => TrackTimeScale::<i64>(0, 0),
     };
 
     let (stsc, stco, stsz, stts) =
         match (&track.stsc, &track.stco, &track.stsz, &track.stts) {