X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-rad%2Fsrc%2Fdemuxers%2Fbink.rs;h=35bdcbf6126234a4030f432412403901e7c9f4e6;hb=4b56e8c9d1b60914c154720561ba759a343d5bbf;hp=d0ae143ac9b7d7e827a5105a95e4aa0b3723261d;hpb=4cfb5dd496118a94b7b59b806f0b81a17e47630c;p=nihav.git diff --git a/nihav-rad/src/demuxers/bink.rs b/nihav-rad/src/demuxers/bink.rs index d0ae143..35bdcbf 100644 --- a/nihav-rad/src/demuxers/bink.rs +++ b/nihav-rad/src/demuxers/bink.rs @@ -66,6 +66,8 @@ impl<'a> DemuxCore<'a> for BinkDemuxer<'a> { let tb_num = src.read_u32le()?; validate!((width > 0) && (height > 0) && (width <= 7680) && (height <= 4800)); validate!((self.frames > 0) && (tb_num > 0) && (tb_den > 0) && (max_size < fsize)); + self.tb_num = tb_num; + self.tb_den = tb_den; let mut flags: [u8; 4] = [0; 4]; src.read_buf(&mut flags)?; let mut edata: Vec = vec![0; 8]; @@ -112,7 +114,7 @@ impl<'a> DemuxCore<'a> for BinkDemuxer<'a> { seek_idx.seek_info[0].filled = true; self.cur_frame = 0; - + Ok(()) } fn get_frame(&mut self, strmgr: &mut StreamManager) -> DemuxerResult { @@ -163,6 +165,12 @@ impl<'a> DemuxCore<'a> for BinkDemuxer<'a> { } } +impl<'a> NAOptionHandler for BinkDemuxer<'a> { + fn get_supported_options(&self) -> &[NAOptionDefinition] { &[] } + fn set_options(&mut self, _options: &[NAOption]) { } + fn query_option_value(&self, _name: &str) -> Option { None } +} + impl<'a> BinkDemuxer<'a> { fn new(io: &'a mut ByteReader<'a>) -> Self { Self { @@ -205,7 +213,8 @@ mod test { let mut br = ByteReader::new(&mut fr); let mut dmx = BinkDemuxer::new(&mut br); let mut sm = StreamManager::new(); - dmx.open(&mut sm).unwrap(); + let mut si = SeekIndex::new(); + dmx.open(&mut sm, &mut si).unwrap(); loop { let pktres = dmx.get_frame(&mut sm); if let Err(e) = pktres {