X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-rad%2Fsrc%2Fcodecs%2Fbinkaud.rs;h=7e34739f07a2f6dbb8992ead35b3aed168e96e5a;hb=e64739f87a35f29be0bbbce366876180ba3eb57e;hp=05440190008cd533efb394ad4841cd2287045801;hpb=b3799375d68d06aa6d6872f7df33a6f5ddf5c503;p=nihav.git

diff --git a/nihav-rad/src/codecs/binkaud.rs b/nihav-rad/src/codecs/binkaud.rs
index 0544019..7e34739 100644
--- a/nihav-rad/src/codecs/binkaud.rs
+++ b/nihav-rad/src/codecs/binkaud.rs
@@ -71,7 +71,7 @@ impl BinkAudioDecoder {
             transform:  Transform::None,
             version_b:  false,
             len:        0,
-            quants:     quants,
+            quants,
             bands:      [MAX_BANDS + 1; 26],
             num_bands:  0,
             duration:   0,
@@ -178,13 +178,13 @@ const CRITICAL_FREQS: [usize; MAX_BANDS] = [
 const RUN_TAB: [usize; 16] = [ 2, 3, 4, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 16, 32, 64 ];
 
 impl NADecoder for BinkAudioDecoder {
-    fn init(&mut self, info: Rc<NACodecInfo>) -> DecoderResult<()> {
+    fn init(&mut self, _supp: &mut NADecoderSupport, info: NACodecInfoRef) -> DecoderResult<()> {
         if let NACodecTypeInfo::Audio(ainfo) = info.get_properties() {
             let srate    = ainfo.get_sample_rate();
             let channels = ainfo.get_channels();
             validate!(channels <= 2);
             self.ainfo = NAAudioInfo::new(srate, channels, SND_F32P_FORMAT, 2);
-            self.chmap = NAChannelMap::from_str("L,R").unwrap();
+            self.chmap = NAChannelMap::from_str(if channels == 2 {"L,R"} else {"C"}).unwrap();
             if let Some(ref edata) = info.get_extradata() {
                 if edata.as_slice() == b"BIKb" {
                     self.version_b = true;
@@ -203,7 +203,7 @@ impl NADecoder for BinkAudioDecoder {
                 self.duration >>= 1;
             }
             self.transform = if !self.use_dct {
-                    Transform::RDFT(RDFTBuilder::new_rdft(FFTMode::SplitRadix, self.len >> 1, false, false))
+                    Transform::RDFT(RDFTBuilder::new_rdft(self.len >> 1, false, false))
                 } else {
                     Transform::DCT(DCT::new(DCTMode::DCT_III, self.len))
                 };
@@ -229,20 +229,20 @@ impl NADecoder for BinkAudioDecoder {
             Err(DecoderError::InvalidData)
         }
     }
-    fn decode(&mut self, pkt: &NAPacket) -> DecoderResult<NAFrameRef> {
+    fn decode(&mut self, _supp: &mut NADecoderSupport, pkt: &NAPacket) -> DecoderResult<NAFrameRef> {
         let info = pkt.get_stream().get_info();
         if let NACodecTypeInfo::Audio(_) = info.get_properties() {
             let pktbuf = pkt.get_buffer();
             validate!(pktbuf.len() > 1);
-            let mut br = BitReader::new(&pktbuf, pktbuf.len(), BitReaderMode::LE);
+            let mut br = BitReader::new(&pktbuf, BitReaderMode::LE);
             let nsamples = br.read(32)? as usize;
 //            validate!(nsamples % self.duration == 0);
 
-            let mut abuf = alloc_audio_buffer(self.ainfo, nsamples / self.chmap.num_channels() / 2, self.chmap.clone())?;
+            let abuf = alloc_audio_buffer(self.ainfo, nsamples / self.chmap.num_channels() / 2, self.chmap.clone())?;
             let mut adata = abuf.get_abuf_f32().unwrap();
             let mut off0 = adata.get_offset(0);
             let mut off1 = adata.get_offset(1);
-            let mut dst = adata.get_data_mut();
+            let dst = adata.get_data_mut().unwrap();
 
             let num_subframes = nsamples / self.duration / self.chmap.num_channels() / 2;
 
@@ -268,18 +268,21 @@ impl NADecoder for BinkAudioDecoder {
             let mut frm = NAFrame::new_from_pkt(pkt, info, abuf);
             frm.set_duration(Some(self.duration as u64));
             frm.set_keyframe(false);
-            Ok(Rc::new(RefCell::new(frm)))
+            Ok(frm.into_ref())
         } else {
             Err(DecoderError::InvalidData)
         }
     }
+    fn flush(&mut self) {
+        self.delay = [[0.0; 256]; 2];
+    }
 }
 
-pub fn get_decoder_dct() -> Box<NADecoder> {
+pub fn get_decoder_dct() -> Box<dyn NADecoder + Send> {
     Box::new(BinkAudioDecoder::new(true))
 }
 
-pub fn get_decoder_rdft() -> Box<NADecoder> {
+pub fn get_decoder_rdft() -> Box<dyn NADecoder + Send> {
     Box::new(BinkAudioDecoder::new(false))
 }
 
@@ -288,8 +291,8 @@ mod test {
     use nihav_core::codecs::RegisteredDecoders;
     use nihav_core::demuxers::RegisteredDemuxers;
     use nihav_core::test::dec_video::*;
-    use crate::codecs::rad_register_all_codecs;
-    use crate::demuxers::rad_register_all_demuxers;
+    use crate::rad_register_all_codecs;
+    use crate::rad_register_all_demuxers;
 
     #[test]
     fn test_bink_audio() {
@@ -303,6 +306,6 @@ mod test {
 //        let file = "assets/RAD/Snd0a110c51.dee";
 //        let file = "assets/RAD/NEW.BIK";
 //        let file = "assets/RAD/ge_video_86l.bk2";
-        test_decode_audio("bink", file, None, "bink", &dmx_reg, &dec_reg);
+        test_decode_audio("bink", file, None, None/*Some("bink")*/, &dmx_reg, &dec_reg);
     }
 }