X-Git-Url: https://git.nihav.org/?p=nihav-tool.git;a=blobdiff_plain;f=src%2Fdemux.rs;h=9ea9cbb16a9b03dfb3f809eeb8d2b9bcc7ff54f0;hp=8a58f2d5ec582eadb1db2db3535a9f9f8d163a86;hb=HEAD;hpb=9ba5cad53d7bdde5c1fbbcf33bcb554a3bfa0b9d diff --git a/src/demux.rs b/src/demux.rs index 8a58f2d..1dc78c5 100644 --- a/src/demux.rs +++ b/src/demux.rs @@ -98,27 +98,38 @@ 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 != "" { + if !dmx_name.is_empty() { 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); } } - if dmx_name != "" { + if !dmx_name.is_empty() { 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()) { - let packetiser = (pcreate)(); + let mut packetiser = (pcreate)(); + packetiser.attach_stream(stream); pkts.push(Some(packetiser)); } else { pkts.push(None); @@ -131,7 +142,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 +158,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() { @@ -158,7 +170,7 @@ impl<'a> DemuxerObject<'a> { break; } } - if pname != "" { + if !pname.is_empty() { println!("found raw stream of type {} for {}", pname, name); let pcreate = reg.pkt_reg.find_packetiser(pname).unwrap(); let mut packetiser = (pcreate)(); @@ -171,15 +183,15 @@ impl<'a> DemuxerObject<'a> { } } pub fn is_none(&self) -> bool { - match *self { - DemuxerObject::None => true, - _ => false, - } + matches!(*self, DemuxerObject::None) } pub fn get_duration(&self) -> u64 { 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 +311,31 @@ pub fn detect_tags(br: &mut ByteReader) -> (bool, u64, Option) { // 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 +343,20 @@ pub fn detect_tags(br: &mut ByteReader) -> (bool, u64, Option) { 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::() { + end = Some(br.tell() - size); + } + } + } } // check for APETAG let mut buf = [0; 8]; @@ -341,6 +378,27 @@ pub fn detect_tags(br: &mut ByteReader) -> (bool, u64, Option) { 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) }