ignore MusicMatch tag

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

diff --git a/src/demux.rs b/src/demux.rs
index 8a58f2d5ec582eadb1db2db3535a9f9f8d163a86..07862753433ae696796240477228aaa512febd8b 100644 (file)
--- a/src/demux.rs
+++ b/src/demux.rs
@@ -147,7 +147,8 @@ impl<'a> DemuxerObject<'a> {
         }
         br.seek(SeekFrom::Start(0)).unwrap();
         let mut buf = vec![0; 1048576];
-        let size = br.peek_buf(&mut buf).unwrap();
+        let size = br.read_buf_some(&mut buf).unwrap();
+        br.seek(SeekFrom::Start(0)).unwrap();
         let mut pname = "";
 
         for pinfo in reg.pkt_reg.iter() {
@@ -180,6 +181,9 @@ impl<'a> DemuxerObject<'a> {
         match *self {
             DemuxerObject::Normal(ref dmx) => dmx.get_duration(),
             DemuxerObject::Raw(ref dmx, _, _) => dmx.get_duration(),
+            DemuxerObject::RawStream(ref ctx) => {
+                NATimeInfo::ts_to_time(ctx.stream.duration, 1000, ctx.stream.tb_num, ctx.stream.tb_den)
+            },
             _ => 0,
         }
     }
@@ -299,20 +303,31 @@ pub fn detect_tags(br: &mut ByteReader) -> (bool, u64, Option<u64>) {
 
     // check for ID3v{2-4}
     let mut buf = [0; 5];
-    br.peek_buf(&mut buf).unwrap();
-    if &buf[0..3] == b"ID3" && buf[3] > 0 && buf[3] < 5 && buf[4] == 0 { //ID3 tag found, must be a raw stream
-        br.read_skip(6).unwrap();
-        let mut size = 0;
-        for _ in 0..4 {
-            let b = br.read_byte().unwrap();
-            if (b & 0x80) != 0 {
-                println!("Invalid ID3 size");
-                break;
+    loop {
+        if br.peek_buf(&mut buf).is_err() {
+            break;
+        }
+        if &buf[0..3] == b"ID3" && buf[3] > 0 && buf[3] < 5 && buf[4] == 0 { //ID3 tag found, must be a raw stream
+            br.read_skip(6).unwrap();
+            let mut size = 0;
+            for _ in 0..4 {
+                let b = br.read_byte().unwrap();
+                if (b & 0x80) != 0 {
+                    println!("Invalid ID3 size");
+                    break;
+                }
+                size = (size << 7) | u64::from(b);
+            }
+            start += size + 10;
+            br.read_skip(size as usize).unwrap();
+            while let Ok(0) = br.read_byte() {
+                start += 1;
             }
-            size = (size << 7) | u64::from(b);
+            br.seek(SeekFrom::Start(start)).unwrap();
+            is_raw = true;
+        } else {
+            break;
         }
-        start = size + 10;
-        is_raw = true;
     }
     // check for ID3v1
     br.seek(SeekFrom::End(-128)).unwrap();
@@ -320,6 +335,20 @@ pub fn detect_tags(br: &mut ByteReader) -> (bool, u64, Option<u64>) {
     br.peek_buf(&mut buf[..3]).unwrap();
     if &buf[0..3] == b"TAG" {
         end = Some(off);
+        // check for Lyrics v2
+        let mut sig = [0; 9];
+        br.seek(SeekFrom::End(-128 - 9)).unwrap();
+        br.peek_buf(&mut sig).unwrap();
+        if &sig == b"LYRICS200" {
+            br.seek(SeekFrom::Current(-6)).unwrap();
+            let mut sizestr = [0; 6];
+            br.peek_buf(&mut sizestr).unwrap();
+            if let Ok(sstr) = std::str::from_utf8(&sizestr) {
+                if let Ok(size) = sstr.parse::<u64>() {
+                    end = Some(br.tell() - size);
+                }
+            }
+        }
     }
     // check for APETAG
     let mut buf = [0; 8];
@@ -341,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)
 }