X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-rad%2Fsrc%2Fdemuxers%2Fbink.rs;h=29427af1bab54b6df777cca6b2c9e1801cb58641;hb=3584b223ce417fe167dc90cb9a40e173f34823c0;hp=4e0be7f0a55d9822b444fc323b25a35ddf578fa6;hpb=5faa5676138924a81d90f23377915d791695fd3b;p=nihav.git

diff --git a/nihav-rad/src/demuxers/bink.rs b/nihav-rad/src/demuxers/bink.rs
index 4e0be7f..29427af 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) -> 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"
@@ -17,7 +17,9 @@ impl AudioTrack {
                 "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();
@@ -66,8 +68,7 @@ impl<'a> DemuxCore<'a> for BinkDemuxer<'a> {
         validate!((self.frames > 0) && (tb_num > 0) && (tb_den > 0) && (max_size < fsize));
         let mut flags: [u8; 4] = [0; 4];
                                               src.read_buf(&mut flags)?;
-        let mut edata: Vec<u8> = Vec::with_capacity(8);
-        edata.resize(8, 0);
+        let mut edata: Vec<u8> = vec![0; 8];
         let p0 = &mut edata[0..4];
         p0.copy_from_slice(&magic);
         let p1 = &mut edata[4..][..4];
@@ -80,6 +81,9 @@ impl<'a> DemuxCore<'a> for BinkDemuxer<'a> {
         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);
@@ -87,14 +91,14 @@ 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)?);
+            self.ainfo.push(AudioTrack::new(strmgr, srate, flags, i, &magic)?);
         }
         for _ in 0..num_audio {
             let _trk_id                     = src.read_u32le()?;
         }
 
         self.frame_pos = Vec::with_capacity(self.frames + 1);
-        for _ in 0..self.frames+1 {
+        for _ in 0..=self.frames {
             let pos                         = src.read_u32le()?;
             self.frame_pos.push(pos);
         }
@@ -165,7 +169,7 @@ impl<'a> BinkDemuxer<'a> {
 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" }