X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-rad%2Fsrc%2Fdemuxers%2Fbink.rs;h=8dfbf64056157c67fa46248dd607bf0f21191d82;hb=6011e20199143f519881660144a4ca95ba77fd2d;hp=e54ea8c7746bbbb81658dcdd3a238129c3afa6f2;hpb=c6c21059c1782d1be3bce200862e96bf97c960bd;p=nihav.git

diff --git a/nihav-rad/src/demuxers/bink.rs b/nihav-rad/src/demuxers/bink.rs
index e54ea8c..8dfbf64 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();
@@ -80,6 +82,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,7 +92,7 @@ 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()?;
@@ -117,12 +122,14 @@ impl<'a> DemuxCore<'a> for BinkDemuxer<'a> {
             validate!(payload_size > size + 4);
             payload_size -= size + 4;
 
-            let strres = strmgr.get_stream(atrk.id);
-            validate!(strres.is_some());
-            let stream = strres.unwrap();
-            let ts = NATimeInfo::new(Some(self.cur_frame as u64), None, None, self.tb_num, self.tb_den);
-            let pkt = self.src.read_packet(stream.clone(), ts, true, size)?;
-            self.queued_packets.push(pkt);
+            if size > 0 {
+                let strres = strmgr.get_stream(atrk.id);
+                validate!(strres.is_some());
+                let stream = strres.unwrap();
+                let ts = NATimeInfo::new(Some(self.cur_frame as u64), None, None, self.tb_num, self.tb_den);
+                let pkt = self.src.read_packet(stream.clone(), ts, true, size)?;
+                self.queued_packets.push(pkt);
+            }
         }
         self.queued_packets.reverse();
 
@@ -163,7 +170,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" }