}
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()) {
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)();
}
}
pub fn is_none(&self) -> bool {
- match *self {
- DemuxerObject::None => true,
- _ => false,
- }
+ matches!(*self, DemuxerObject::None)
}
pub fn get_duration(&self) -> u64 {
match *self {