ignore MusicMatch tag

[nihav-tool.git] / src / demux.rs

diff --git a/src/demux.rs b/src/demux.rs
index e274e7159fc63dd341fae6dab282a31136ab6169..07862753433ae696796240477228aaa512febd8b 100644 (file)
--- a/src/demux.rs
+++ b/src/demux.rs
@@ -320,6 +320,10 @@ pub fn detect_tags(br: &mut ByteReader) -> (bool, u64, Option<u64>) {
             }
             start += size + 10;
             br.read_skip(size as usize).unwrap();
+            while let Ok(0) = br.read_byte() {
+                start += 1;
+            }
+            br.seek(SeekFrom::Start(start)).unwrap();
             is_raw = true;
         } else {
             break;
@@ -366,6 +370,27 @@ pub fn detect_tags(br: &mut ByteReader) -> (bool, u64, Option<u64>) {
             end = Some(off - size);
         }
     }
+    // check for MusicMatch tag
+    let ret = if let Some(endpos) = end {
+            br.seek(SeekFrom::Start(endpos - 0x30))
+        } else {
+            br.seek(SeekFrom::End(-0x30))
+        };
+    if ret.is_ok() && br.tell() > (0x2000 - 0x30) {
+        let mut buf = [0; 19];
+        br.peek_buf(&mut buf).unwrap();
+        if &buf == b"Brava Software Inc." {
+            br.seek(SeekFrom::Current(-20)).unwrap();
+            let mut mm_start = u64::from(br.read_u32le().unwrap());
+            if mm_start > 4 && mm_start + 0x2000 <= br.tell() {
+                let diff = (br.tell() - mm_start) & 3;
+                if diff != 0 {
+                    mm_start -= 4 - diff;
+                }
+                end = Some(mm_start);
+            }
+        }
+    }
 
     (is_raw, start, end)
 }