X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;ds=sidebyside;f=nihav-realmedia%2Fsrc%2Fcodecs%2Fra288.rs;h=a041d057c1a866a680c6c19401cc5b8c24363f4d;hb=e64739f87a35f29be0bbbce366876180ba3eb57e;hp=ef8faaea8e531c82e97fc63258cd99e50ebeecd5;hpb=f9be4e750dccff762b9a3d894faec50ffdb59233;p=nihav.git

diff --git a/nihav-realmedia/src/codecs/ra288.rs b/nihav-realmedia/src/codecs/ra288.rs
index ef8faae..a041d05 100644
--- a/nihav-realmedia/src/codecs/ra288.rs
+++ b/nihav-realmedia/src/codecs/ra288.rs
@@ -175,7 +175,7 @@ impl NADecoder for RA288Decoder {
         let dst = adata.get_data_mut().unwrap();
 
         for (input, output) in pktbuf.chunks(FRAME_SIZE).zip(dst.chunks_mut(NBLOCKS * BLOCKSIZE)) {
-            let mut br = BitReader::new(input, input.len(), BitReaderMode::LE);
+            let mut br = BitReader::new(input, BitReaderMode::LE);
 
             for (i, block) in output.chunks_mut(BLOCKSIZE).enumerate() {
                 let gain = RA288_GAIN_TAB[br.read(3)? as usize];
@@ -201,7 +201,7 @@ impl NADecoder for RA288Decoder {
     }
 }
 
-pub fn get_decoder() -> Box<dyn NADecoder> {
+pub fn get_decoder() -> Box<dyn NADecoder + Send> {
     Box::new(RA288Decoder::new())
 }
 
@@ -210,8 +210,8 @@ mod test {
     use nihav_core::codecs::RegisteredDecoders;
     use nihav_core::demuxers::RegisteredDemuxers;
     use nihav_core::test::dec_video::*;
-    use crate::codecs::realmedia_register_all_codecs;
-    use crate::demuxers::realmedia_register_all_demuxers;
+    use crate::realmedia_register_all_codecs;
+    use crate::realmedia_register_all_demuxers;
     #[test]
     fn test_ra288() {
         let mut dmx_reg = RegisteredDemuxers::new();
@@ -220,7 +220,7 @@ mod test {
         realmedia_register_all_codecs(&mut dec_reg);
 
         let file = "assets/RV/A0000044.rm";
-        test_decode_audio("realmedia", file, Some(5000), "ra28.8", &dmx_reg, &dec_reg);
+        test_decode_audio("realmedia", file, Some(5000), None/*Some("ra28.8")*/, &dmx_reg, &dec_reg);
     }
 }