}
}
+pub struct RawStreamCtx<'a> {
+ stream: NAStreamRef,
+ pkt: Box<dyn NAPacketiser + Send>,
+ br: &'a mut ByteReader<'a>,
+ pts: u64,
+ seek: SeekIndex,
+}
+
+impl<'a> RawStreamCtx<'a> {
+ fn new(stream: NAStreamRef, packetiser: Box<dyn NAPacketiser + Send>, br: &'a mut ByteReader<'a>) -> Self {
+ let mut seek = SeekIndex::new();
+ seek.add_stream(0);
+ Self { stream, pkt: packetiser, br, pts: 0, seek }
+ }
+ fn account_for_packet(&mut self, packet: &mut NAPacket) {
+ let pos = self.br.tell() - (self.pkt.bytes_left() as u64);
+ if packet.get_pts().is_none() && packet.get_duration().is_some() {
+ packet.ts.pts = Some(self.pts);
+ }
+ if packet.is_keyframe() {
+ let pts = packet.get_pts().unwrap_or(self.pts);
+ let time = NATimeInfo::ts_to_time(pts, 1000, self.stream.tb_num, self.stream.tb_den);
+ let in_range = if let Some(last) = self.seek.seek_info[0].entries.last() {
+ last.pts >= pts
+ } else {
+ false
+ };
+ if !in_range {
+ self.seek.add_entry(0, SeekEntry { time, pts, pos });
+ }
+ }
+ self.pts += packet.get_duration().unwrap_or(0);
+ }
+ fn get_frame(&mut self) -> DemuxerResult<NAPacket> {
+ let mut buf = [0; 1048576];
+ loop {
+ match self.pkt.get_packet(self.stream.clone()) {
+ Ok(Some(mut packet)) => {
+ self.account_for_packet(&mut packet);
+ return Ok(packet);
+ },
+ Ok(None) => {},
+ Err(DecoderError::ShortData) => {},
+ _ => return Err(DemuxerError::InvalidData),
+ };
+ match self.br.read_buf_some(&mut buf) {
+ Ok(size) => {
+ self.pkt.add_data(&buf[..size]);
+ },
+ Err(_) => {
+ match self.pkt.get_packet(self.stream.clone()) {
+ Ok(Some(mut packet)) => {
+ self.account_for_packet(&mut packet);
+ return Ok(packet);
+ },
+ Ok(None) | Err(DecoderError::ShortData) => return Err(DemuxerError::EOF),
+ _ => return Err(DemuxerError::InvalidData),
+ };
+ },
+ };
+ }
+ }
+}
+
pub enum DemuxerObject<'a> {
None,
Normal(Demuxer<'a>),
Raw(RawDemuxer<'a>, Vec<Option<Box<dyn NAPacketiser + Send>>>, bool),
- RawStream(Box<dyn NAPacketiser + Send>, NAStreamRef, &'a mut ByteReader<'a>),
+ RawStream(RawStreamCtx<'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);
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()) {
}
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() {
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)();
packetiser.add_data(&buf[..size]);
let stream = packetiser.parse_stream(0).unwrap();
packetiser.reset();
- DemuxerObject::RawStream(packetiser, stream, br)
+ DemuxerObject::RawStream(RawStreamCtx::new(stream, packetiser, br))
} else {
DemuxerObject::None
}
}
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,
}
}
DemuxerObject::None => 0,
DemuxerObject::Normal(ref dmx) => dmx.get_num_streams(),
DemuxerObject::Raw(ref dmx, _, _) => dmx.get_num_streams(),
- DemuxerObject::RawStream(_, _, _) => 1,
+ DemuxerObject::RawStream(_) => 1,
}
}
pub fn get_stream(&self, idx: usize) -> Option<NAStreamRef> {
match *self {
DemuxerObject::Normal(ref dmx) => dmx.get_stream(idx),
DemuxerObject::Raw(ref dmx, _, _) => dmx.get_stream(idx),
- DemuxerObject::RawStream(_, ref stream, _) if idx == 0 => Some(stream.clone()),
+ DemuxerObject::RawStream(ref ctx) if idx == 0 => Some(ctx.stream.clone()),
_ => None,
}
}
}
}
},
- DemuxerObject::RawStream(ref mut pkt, ref stream, ref mut br) => {
- let mut buf = [0; 1048576];
- loop {
- match pkt.get_packet(stream.clone()) {
- Ok(Some(packet)) => return Ok(packet),
- Ok(None) => {},
- Err(DecoderError::ShortData) => {},
- _ => return Err(DemuxerError::InvalidData),
- };
- match br.read_buf_some(&mut buf) {
- Ok(size) => {
- pkt.add_data(&buf[..size]);
- },
- Err(_) => {
- match pkt.get_packet(stream.clone()) {
- Ok(Some(packet)) => return Ok(packet),
- Ok(None) | Err(DecoderError::ShortData) => return Err(DemuxerError::EOF),
- _ => return Err(DemuxerError::InvalidData),
- };
- },
- };
- }
- },
+ DemuxerObject::RawStream(ref mut ctx) => ctx.get_frame(),
_ => unreachable!(),
}
}
match *self {
DemuxerObject::Normal(ref mut dmx) => dmx.seek(seek_time),
DemuxerObject::Raw(ref mut dmx, _, _) => dmx.seek(seek_time),
+ DemuxerObject::RawStream(ref mut ctx) => {
+ if seek_time == NATimePoint::None {
+ return Err(DemuxerError::SeekError);
+ }
+ if let Some(last) = ctx.seek.seek_info[0].entries.last() {
+ let in_index = match seek_time {
+ NATimePoint::None => unreachable!(),
+ NATimePoint::PTS(pts) => last.pts >= pts,
+ NATimePoint::Milliseconds(ms) => last.time >= ms,
+ };
+ if in_index {
+ if let Some(result) = ctx.seek.find_pos(seek_time) {
+ ctx.br.seek(SeekFrom::Start(result.pos))?;
+ ctx.pts = result.pts;
+ ctx.pkt.reset();
+ return Ok(());
+ }
+ }
+ }
+ if let Some(last) = ctx.seek.seek_info[0].entries.last() {
+ ctx.br.seek(SeekFrom::Start(last.pos))?;
+ ctx.pts = last.pts;
+ ctx.pkt.reset();
+ }
+ let mut key_pts = 0;
+ while let Ok(pkt) = ctx.get_frame() {
+ if !pkt.ts.less_than(seek_time) && !pkt.ts.equal(seek_time) {
+ break;
+ }
+ if pkt.is_keyframe() {
+ key_pts = pkt.get_pts().unwrap_or(0);
+ }
+ }
+ let result = ctx.seek.find_pos(NATimePoint::PTS(key_pts)).unwrap();
+ ctx.br.seek(SeekFrom::Start(result.pos))?;
+ ctx.pts = result.pts;
+ ctx.pkt.reset();
+ Ok(())
+ },
_ => Err(DemuxerError::NotImplemented),
}
}
// 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();
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];
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)
}
projects / nihav-tool.git / blobdiff