X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=src%2Fdemux.rs;h=9c65b85614387b0089bd86c15881f2ccf37beee0;hb=081797c71bd8cd4342d58a2124cbd7f72d02b7d2;hp=a05806855c83ffc4b303e8f29d87e3200a45df81;hpb=18f43812ae740cce5834cf8f2a334ea4db9c21f1;p=nihav-tool.git

diff --git a/src/demux.rs b/src/demux.rs
index a058068..9c65b85 100644
--- a/src/demux.rs
+++ b/src/demux.rs
@@ -98,15 +98,25 @@ pub enum DemuxerObject<'a> {
 }
 
 impl<'a> DemuxerObject<'a> {
-    pub fn create(br: &'a mut ByteReader<'a>, reg: &FullRegister, name: &str, is_raw: bool) -> DemuxerObject<'a> {
+    pub fn create(br: &'a mut ByteReader<'a>, reg: &FullRegister, name: &str, force_dmx: Option<&str>, is_raw: bool, opts: &[NAOption]) -> DemuxerObject<'a> {
         if !is_raw {
             let res = detect::detect_format(name, br);
+            if let Some(dmx_name) = force_dmx {
+                println!("forcing demuxer {} on {}", dmx_name, name);
+                if let Some(dmx_fact) = reg.dmx_reg.find_demuxer(dmx_name) {
+                    br.seek(SeekFrom::Start(0)).unwrap();
+                    let dmx = create_demuxer_with_options(dmx_fact, br, opts).unwrap();
+                    return DemuxerObject::Normal(dmx);
+                } else {
+                    return DemuxerObject::None
+                }
+            }
             let (dmx_name, _) = res.unwrap_or(("", detect::DetectionScore::No));
             if dmx_name != "" {
                 println!("trying demuxer {} on {}", dmx_name, name);
                 if let Some(dmx_fact) = reg.dmx_reg.find_demuxer(dmx_name) {
                     br.seek(SeekFrom::Start(0)).unwrap();
-                    let dmx = create_demuxer(dmx_fact, br).unwrap();
+                    let dmx = create_demuxer_with_options(dmx_fact, br, opts).unwrap();
                     return DemuxerObject::Normal(dmx);
                 }
             }
@@ -114,7 +124,7 @@ impl<'a> DemuxerObject<'a> {
                 println!("trying raw demuxer {} on {}", dmx_name, name);
                 if let Some(rdmx_fact) = reg.rdmx_reg.find_demuxer(dmx_name) {
                     br.seek(SeekFrom::Start(0)).unwrap();
-                    let dmx = create_raw_demuxer(rdmx_fact, br).unwrap();
+                    let dmx = create_raw_demuxer_with_options(rdmx_fact, br, opts).unwrap();
                     let mut pkts = Vec::new();
                     for stream in dmx.get_streams() {
                         if let Some(pcreate) = reg.pkt_reg.find_packetiser(stream.get_info().get_name()) {
@@ -131,7 +141,7 @@ impl<'a> DemuxerObject<'a> {
                 if rdmx.check_format(br) {
                     println!("detected {} as {}", name, rdmx.get_name());
                     br.seek(SeekFrom::Start(0)).unwrap();
-                    let dmx = create_raw_demuxer(*rdmx, br).unwrap();
+                    let dmx = create_raw_demuxer_with_options(*rdmx, br, opts).unwrap();
                     let mut pkts = Vec::new();
                     for stream in dmx.get_streams() {
                         if let Some(pcreate) = reg.pkt_reg.find_packetiser(stream.get_info().get_name()) {
@@ -147,7 +157,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() {
@@ -319,6 +330,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;
@@ -365,6 +380,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)
 }