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

diff --git a/nihav-rad/src/codecs/binkaud.rs b/nihav-rad/src/codecs/binkaud.rs
index 86f4fb0..7e34739 100644
--- a/nihav-rad/src/codecs/binkaud.rs
+++ b/nihav-rad/src/codecs/binkaud.rs
@@ -234,7 +234,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);
 
@@ -278,11 +278,11 @@ impl NADecoder for BinkAudioDecoder {
     }
 }
 
-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))
 }
 
@@ -291,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() {
@@ -306,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);
     }
 }