X-Git-Url: https://git.nihav.org/?p=nihav.git;a=blobdiff_plain;f=nihav-rad%2Fsrc%2Fdemuxers%2Fbink.rs;h=83da6acaebcb95643070ae21d027b969dc2ded1b;hp=29d756fc76c328ac98b8eddc1fd1ac263133a587;hb=a480a0de101483d802a11e72d758dae00fa4860a;hpb=bce85425aa0ae35d21d9699b07ea77197b789ff7 diff --git a/nihav-rad/src/demuxers/bink.rs b/nihav-rad/src/demuxers/bink.rs index 29d756f..83da6ac 100644 --- a/nihav-rad/src/demuxers/bink.rs +++ b/nihav-rad/src/demuxers/bink.rs @@ -9,7 +9,7 @@ const BINK_AUD_FLAG_DCT: u8 = 0x10; const BINK_AUD_FLAG_STEREO: u8 = 0x20; impl AudioTrack { - fn new(strmgr: &mut StreamManager, srate: u32, flags: u8, str_id: usize, magic: &[u8; 4]) -> DemuxerResult { + fn new(strmgr: &mut StreamManager, srate: u32, flags: u8, str_id: usize, magic: [u8; 4]) -> DemuxerResult { let channels = if (flags & BINK_AUD_FLAG_STEREO) != 0 { 2 } else { 1 }; let codecname = if (flags & BINK_AUD_FLAG_DCT) != 0 { "bink-audio-dct" @@ -18,9 +18,9 @@ impl AudioTrack { }; let ahdr = NAAudioInfo::new(srate, channels, SND_F32P_FORMAT, 1); let mut edata: Vec = Vec::with_capacity(4); - edata.extend_from_slice(magic); + edata.extend_from_slice(&magic); let ainfo = NACodecInfo::new(codecname, NACodecTypeInfo::Audio(ahdr), Some(edata)); - let res = strmgr.add_stream(NAStream::new(StreamType::Audio, (str_id + 1) as u32, ainfo, 1, srate)); + let res = strmgr.add_stream(NAStream::new(StreamType::Audio, (str_id + 1) as u32, ainfo, 1, srate, 0)); validate!(res.is_some()); let id = res.unwrap(); Ok(Self{ id }) @@ -49,7 +49,7 @@ macro_rules! mktag { } impl<'a> DemuxCore<'a> for BinkDemuxer<'a> { - fn open(&mut self, strmgr: &mut StreamManager) -> DemuxerResult<()> { + fn open(&mut self, strmgr: &mut StreamManager, seek_idx: &mut SeekIndex) -> DemuxerResult<()> { let src = &mut self.src; let mut magic: [u8; 4] = [0; 4]; src.read_buf(&mut magic)?; @@ -66,10 +66,11 @@ 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::with_capacity(8); - edata.resize(8, 0); + let mut edata: Vec = vec![0; 8]; let p0 = &mut edata[0..4]; p0.copy_from_slice(&magic); let p1 = &mut edata[4..][..4]; @@ -77,11 +78,14 @@ impl<'a> DemuxCore<'a> for BinkDemuxer<'a> { let vhdr = NAVideoInfo::new(width, height, false, YUV420_FORMAT); let codec = if magic[0] == b'K' && magic[1] == b'B' && magic[2] == b'2' { "bink2-video" } else { "bink-video" }; let vinfo = NACodecInfo::new(codec, NACodecTypeInfo::Video(vhdr), Some(edata)); - let res = strmgr.add_stream(NAStream::new(StreamType::Video, 0, vinfo, self.tb_num, self.tb_den)); + let res = strmgr.add_stream(NAStream::new(StreamType::Video, 0, vinfo, self.tb_num, self.tb_den, self.frames as u64)); validate!(res.is_some()); self.video_id = res.unwrap(); let num_audio = src.read_u32le()? as usize; + if magic_tag >= mktag!(b"KB2i") { + src.read_skip(4)?; + } validate!(num_audio < 256); src.read_skip(num_audio * 4)?; // audio max output frame size? self.ainfo = Vec::with_capacity(num_audio); @@ -89,21 +93,28 @@ impl<'a> DemuxCore<'a> for BinkDemuxer<'a> { let srate = src.read_u24le()?; let flags = src.read_byte()?; validate!(srate > 0); - self.ainfo.push(AudioTrack::new(strmgr, srate, flags, i, &magic)?); + self.ainfo.push(AudioTrack::new(strmgr, srate, flags, i, magic)?); } for _ in 0..num_audio { let _trk_id = src.read_u32le()?; } + seek_idx.mode = SeekIndexMode::Present; + seek_idx.add_stream(0); self.frame_pos = Vec::with_capacity(self.frames + 1); - for _ in 0..self.frames+1 { + for fno in 0..=self.frames { let pos = src.read_u32le()?; self.frame_pos.push(pos); + if (pos & 1) != 0 { + let time = (fno as u64) * 1000 * (tb_num as u64) / (tb_den as u64); + seek_idx.seek_info[0].add_entry(SeekEntry { time, pts: fno as u64, pos: (pos & !1) as u64 }); + } } validate!((src.tell() as u32) == (self.frame_pos[0] & !1)); + seek_idx.seek_info[0].filled = true; self.cur_frame = 0; - + Ok(()) } fn get_frame(&mut self, strmgr: &mut StreamManager) -> DemuxerResult { @@ -141,10 +152,24 @@ impl<'a> DemuxCore<'a> for BinkDemuxer<'a> { Ok(pkt) } - #[allow(unused_variables)] - fn seek(&mut self, time: u64) -> DemuxerResult<()> { - Err(DemuxerError::NotImplemented) + fn seek(&mut self, time: NATimePoint, seek_idx: &SeekIndex) -> DemuxerResult<()> { + let ret = seek_idx.find_pos(time); + if ret.is_none() { + return Err(DemuxerError::SeekError); + } + let seek_info = ret.unwrap(); + self.src.seek(SeekFrom::Start(seek_info.pos))?; + self.queued_packets.clear(); + self.cur_frame = seek_info.pts as usize; + Ok(()) } + fn get_duration(&self) -> u64 { 0 } +} + +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> { @@ -167,7 +192,7 @@ impl<'a> BinkDemuxer<'a> { pub struct BinkDemuxerCreator { } impl DemuxerCreator for BinkDemuxerCreator { - fn new_demuxer<'a>(&self, br: &'a mut ByteReader<'a>) -> Box + 'a> { + fn new_demuxer<'a>(&self, br: &'a mut ByteReader<'a>) -> Box + 'a> { Box::new(BinkDemuxer::new(br)) } fn get_name(&self) -> &'static str { "bink" } @@ -189,7 +214,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 {