X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=sndplay%2Fsrc%2Fdemux.rs;h=d40c29c72741b8ff4927c54479c3d20467e22a17;hb=ff58185ab2070ba00779e48df0fd7e7f6a87ad9e;hp=ac483da389eea1c00d049e1124c82ce4651fb2f8;hpb=dbca8a6d522fde14d236bb09e09d199259288267;p=nihav-player.git

diff --git a/sndplay/src/demux.rs b/sndplay/src/demux.rs
index ac483da..d40c29c 100644
--- a/sndplay/src/demux.rs
+++ b/sndplay/src/demux.rs
@@ -126,7 +126,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() {
@@ -281,20 +282,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();
@@ -302,6 +314,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];