X-Git-Url: https://git.nihav.org/?p=nihav-tool.git;a=blobdiff_plain;f=src%2Fdemux.rs;fp=src%2Fdemux.rs;h=56659c76a4cb928b2cce4144b34c8753dfce0588;hp=07862753433ae696796240477228aaa512febd8b;hb=8a8f6e5c8847945e274c5d7e2c6a51c027c19c35;hpb=033d6b00ff1e99afb0304800fa1b20322933a5c5 diff --git a/src/demux.rs b/src/demux.rs index 0786275..56659c7 100644 --- a/src/demux.rs +++ b/src/demux.rs @@ -98,9 +98,19 @@ 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) -> 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(dmx_fact, br).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);