X-Git-Url: https://git.nihav.org/?p=nihav.git;a=blobdiff_plain;f=nihav-rad%2Fsrc%2Fcodecs%2Fbinkaud.rs;h=1cdb0a1ddbf2c7d6334414786946f8577606cdbf;hp=daae9dffca695ffd8d3a17ef1ad4de8f62f3210d;hb=78fb6560c73965d834b215fb0b49505ae5443288;hpb=6011e20199143f519881660144a4ca95ba77fd2d

diff --git a/nihav-rad/src/codecs/binkaud.rs b/nihav-rad/src/codecs/binkaud.rs
index daae9df..1cdb0a1 100644
--- a/nihav-rad/src/codecs/binkaud.rs
+++ b/nihav-rad/src/codecs/binkaud.rs
@@ -1,6 +1,6 @@
 use nihav_core::codecs::*;
-use nihav_core::dsp::dct::*;
-use nihav_core::dsp::fft::*;
+use nihav_codec_support::dsp::dct::*;
+use nihav_codec_support::dsp::fft::*;
 use nihav_core::io::bitreader::*;
 use std::f32::consts;
 use std::str::FromStr;
@@ -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,
@@ -130,6 +130,7 @@ impl BinkAudioDecoder {
         }
         Ok(())
     }
+    #[allow(clippy::transmute_ptr_to_ptr)]
     fn output(&mut self, dst: &mut [f32], off0: usize, off1: usize, chno: usize) {
         match self.transform {
             Transform::DCT(ref mut dct) => {
@@ -234,7 +235,7 @@ impl NADecoder for BinkAudioDecoder {
         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);
 
@@ -273,13 +274,22 @@ impl NADecoder for BinkAudioDecoder {
             Err(DecoderError::InvalidData)
         }
     }
+    fn flush(&mut self) {
+        self.delay = [[0.0; 256]; 2];
+    }
+}
+
+impl NAOptionHandler for BinkAudioDecoder {
+    fn get_supported_options(&self) -> &[NAOptionDefinition] { &[] }
+    fn set_options(&mut self, _options: &[NAOption]) { }
+    fn query_option_value(&self, _name: &str) -> Option<NAValue> { None }
 }
 
-pub fn get_decoder_dct() -> Box<dyn NADecoder> {
+pub fn get_decoder_dct() -> Box<dyn NADecoder + Send> {
     Box::new(BinkAudioDecoder::new(true))
 }
 
-pub fn get_decoder_rdft() -> Box<dyn NADecoder> {
+pub fn get_decoder_rdft() -> Box<dyn NADecoder + Send> {
     Box::new(BinkAudioDecoder::new(false))
 }
 
@@ -287,22 +297,28 @@ pub fn get_decoder_rdft() -> Box<dyn NADecoder> {
 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 nihav_codec_support::test::dec_video::*;
+    use crate::rad_register_all_decoders;
+    use crate::rad_register_all_demuxers;
 
     #[test]
-    fn test_bink_audio() {
+    fn test_bink_audio_dct() {
+        let mut dmx_reg = RegisteredDemuxers::new();
+        rad_register_all_demuxers(&mut dmx_reg);
+        let mut dec_reg = RegisteredDecoders::new();
+        rad_register_all_decoders(&mut dec_reg);
+
+        let file = "assets/RAD/ActivisionLogo.bik";
+        test_decode_audio("bink", file, None, None/*Some("bink")*/, &dmx_reg, &dec_reg);
+    }
+    #[test]
+    fn test_bink_audio_rdft() {
         let mut dmx_reg = RegisteredDemuxers::new();
         rad_register_all_demuxers(&mut dmx_reg);
         let mut dec_reg = RegisteredDecoders::new();
-        rad_register_all_codecs(&mut dec_reg);
+        rad_register_all_decoders(&mut dec_reg);
 
-//        let file = "assets/RAD/ActivisionLogo.bik";
-        let file = "assets/RAD/original.bik";
-//        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);
+        let file = "assets/RAD/NWCLOGO.BIK";
+        test_decode_audio("bink", file, None, None/*Some("bink")*/, &dmx_reg, &dec_reg);
     }
 }