improve ID3 tag handling

diff --git a/src/demux.rs b/src/demux.rs
index 78743bead1d75ec6c247f71b39355f587c82cbb2..a05806855c83ffc4b303e8f29d87e3200a45df81 100644 (file)
--- a/src/demux.rs
+++ b/src/demux.rs
@@ -302,20 +302,27 @@ pub fn detect_tags(br: &mut ByteReader) -> (bool, u64, Option<u64>) {
 
     // check for ID3v{2-4}
     let mut buf = [0; 5];
 
     // 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);

             }
             }

-            size = (size << 7) | u64::from(b);
+            start += size + 10;
+            br.read_skip(size as usize).unwrap();
+            is_raw = true;
+        } else {
+            break;

         }
         }

-        start = size + 10;
-        is_raw = true;

     }
     // check for ID3v1
     br.seek(SeekFrom::End(-128)).unwrap();
     }
     // check for ID3v1
     br.seek(SeekFrom::End(-128)).unwrap();


@@ -323,6 +330,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);
     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];
     }
     // check for APETAG
     let mut buf = [0; 8];