use nihav_core::io::byteio::ByteReader;
use nihav_allstuff::*;
use crate::null::*;
+use crate::imgseq::*;
pub struct FullRegister {
pub dmx_reg: RegisteredDemuxers,
sm: StreamManager,
packetiser: Box<dyn NAPacketiser + Send>,
br: &'a mut ByteReader<'a>,
+ pts: u64,
}
impl<'a> RawStreamCtx<'a> {
fn new(stream: NAStreamRef, packetiser: Box<dyn NAPacketiser + Send>, br: &'a mut ByteReader<'a>) -> Self {
let mut sm = StreamManager::new();
sm.add_stream_ref(stream.clone());
- Self { stream, sm, packetiser, br }
+ Self { stream, sm, packetiser, br, pts: 0 }
}
}
Normal(Demuxer<'a>),
Raw(RawDemuxer<'a>, Vec<Option<Box<dyn NAPacketiser + Send>>>, bool),
RawStream(RawStreamCtx<'a>),
+ ImageSequence(ImgSeqDemuxer),
}
impl<'a> DemuxerObject<'a> {
} else {
""
};
- 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();
if ifmt.is_some() {
return DemuxerObject::None;
}
- 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();
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)();
DemuxerObject::None
}
}
+ pub fn create_imgseq(isd: ImgSeqDemuxer) -> Self {
+ DemuxerObject::ImageSequence(isd)
+ }
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::Normal(ref dmx) => dmx.get_num_streams(),
DemuxerObject::Raw(ref dmx, _, _) => dmx.get_num_streams(),
DemuxerObject::RawStream(_) => 1,
+ DemuxerObject::ImageSequence(_) => 1,
}
}
pub fn get_stream(&self, idx: usize) -> Option<NAStreamRef> {
DemuxerObject::Normal(ref dmx) => dmx.get_stream(idx),
DemuxerObject::Raw(ref dmx, _, _) => dmx.get_stream(idx),
DemuxerObject::RawStream(ref ctx) if idx == 0 => Some(ctx.stream.clone()),
+ DemuxerObject::ImageSequence(ref ctx) if idx == 0 => Some(ctx.stream.clone()),
_ => None,
}
}
DemuxerObject::Normal(ref dmx) => dmx.get_streams(),
DemuxerObject::Raw(ref dmx, _, _) => dmx.get_streams(),
DemuxerObject::RawStream(ref ctx) => ctx.sm.iter(),
+ DemuxerObject::ImageSequence(ref ctx) => ctx.sm.iter(),
_ => unreachable!(),
}
}
DemuxerObject::Normal(ref dmx) => dmx.get_stream_manager(),
DemuxerObject::Raw(ref dmx, _, _) => dmx.get_stream_manager(),
DemuxerObject::RawStream(ref ctx) => &ctx.sm,
+ DemuxerObject::ImageSequence(ref ctx) => &ctx.sm,
_ => unreachable!(),
}
}
let mut buf = [0; 65536];
loop {
match ctx.packetiser.get_packet(ctx.stream.clone()) {
- Ok(Some(packet)) => return Ok(packet),
+ Ok(Some(mut packet)) => {
+ if packet.get_pts().is_none() && packet.get_duration().is_some() {
+ packet.ts.pts = Some(ctx.pts);
+ }
+ ctx.pts += packet.get_duration().unwrap_or(0);
+ return Ok(packet);
+ },
Ok(None) => {},
Err(DecoderError::ShortData) => {},
_ => return Err(DemuxerError::InvalidData),
},
Err(_) => {
match ctx.packetiser.get_packet(ctx.stream.clone()) {
- Ok(Some(packet)) => return Ok(packet),
+ Ok(Some(mut packet)) => {
+ if packet.get_pts().is_none() && packet.get_duration().is_some() {
+ packet.ts.pts = Some(ctx.pts);
+ }
+ ctx.pts += packet.get_duration().unwrap_or(0);
+ return Ok(packet);
+ },
Ok(None) | Err(DecoderError::ShortData) => return Err(DemuxerError::EOF),
_ => return Err(DemuxerError::InvalidData),
};
};
}
},
+ DemuxerObject::ImageSequence(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::ImageSequence(ref mut ctx) => ctx.seek(seek_time),
_ => Err(DemuxerError::NotImplemented),
}
}
match *self {
DemuxerObject::Normal(ref dmx) => dmx.get_supported_options(),
DemuxerObject::Raw(ref dmx, _, _) => dmx.get_supported_options(),
+ DemuxerObject::ImageSequence(ref ctx) => ctx.get_supported_options(),
_ => &[],
}
}
match *self {
DemuxerObject::Normal(ref mut dmx) => dmx.set_options(options),
DemuxerObject::Raw(ref mut dmx, _, _) => dmx.set_options(options),
+ DemuxerObject::ImageSequence(ref mut ctx) => ctx.set_options(options),
_ => {},
}
}
match *self {
DemuxerObject::Normal(ref dmx) => dmx.query_option_value(name),
DemuxerObject::Raw(ref dmx, _, _) => dmx.query_option_value(name),
+ DemuxerObject::ImageSequence(ref ctx) => ctx.query_option_value(name),
_ => None,
}
}