const BINK_AUD_FLAG_STEREO: u8 = 0x20;
impl AudioTrack {
- fn new(strmgr: &mut StreamManager, srate: u32, flags: u8, str_id: usize) -> DemuxerResult<Self> {
+ fn new(strmgr: &mut StreamManager, srate: u32, flags: u8, str_id: usize, magic: &[u8; 4]) -> DemuxerResult<Self> {
let channels = if (flags & BINK_AUD_FLAG_STEREO) != 0 { 2 } else { 1 };
let codecname = if (flags & BINK_AUD_FLAG_DCT) != 0 {
"bink-audio-dct"
"bink-audio-rdft"
};
let ahdr = NAAudioInfo::new(srate, channels, SND_F32P_FORMAT, 1);
- let ainfo = NACodecInfo::new(codecname, NACodecTypeInfo::Audio(ahdr), None);
+ let mut edata: Vec<u8> = Vec::with_capacity(4);
+ 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));
validate!(res.is_some());
let id = res.unwrap();
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);
let srate = src.read_u24le()?;
let flags = src.read_byte()?;
validate!(srate > 0);
- self.ainfo.push(AudioTrack::new(strmgr, srate, flags, i)?);
+ self.ainfo.push(AudioTrack::new(strmgr, srate, flags, i, &magic)?);
}
for _ in 0..num_audio {
let _trk_id = src.read_u32le()?;
pub struct BinkDemuxerCreator { }
impl DemuxerCreator for BinkDemuxerCreator {
- fn new_demuxer<'a>(&self, br: &'a mut ByteReader<'a>) -> Box<DemuxCore<'a> + 'a> {
+ fn new_demuxer<'a>(&self, br: &'a mut ByteReader<'a>) -> Box<dyn DemuxCore<'a> + 'a> {
Box::new(BinkDemuxer::new(br))
}
fn get_name(&self) -> &'static str { "bink" }