X-Git-Url: https://git.nihav.org/?p=nihav.git;a=blobdiff_plain;f=nihav-realmedia%2Fsrc%2Fcodecs%2Fralf.rs;h=be256b33dc0e682f0170df7623014041f4da3d15;hp=c5a0f7fabe5266e6c650abfd911ea51d9561ba20;hb=78fb6560c73965d834b215fb0b49505ae5443288;hpb=5580b11b0e9daf065c81a8b354295c6d5d1dd3dd

diff --git a/nihav-realmedia/src/codecs/ralf.rs b/nihav-realmedia/src/codecs/ralf.rs
index c5a0f7f..be256b3 100644
--- a/nihav-realmedia/src/codecs/ralf.rs
+++ b/nihav-realmedia/src/codecs/ralf.rs
@@ -277,7 +277,7 @@ impl RALFDecoder {
         }
     }
     fn decode_block(&mut self, off: usize, size: usize, abuf: &mut NABufferType) -> DecoderResult<()> {
-        let mut br = BitReader::new(&self.pkt_buf[off..][..size], size, BitReaderMode::BE);
+        let mut br = BitReader::new(&self.pkt_buf[off..][..size], BitReaderMode::BE);
 
         let length = read_block_length(&mut br).unwrap();
         validate!(length + self.sample_offset <= self.max_frame_size);
@@ -428,7 +428,7 @@ impl NADecoder for RALFDecoder {
         validate!(src_len > table_bytes + 3);
         self.blocks.truncate(0);
         {
-            let mut br = BitReader::new(&self.pkt_buf[2..], table_bytes, BitReaderMode::BE);
+            let mut br = BitReader::new(&self.pkt_buf[2..][..table_bytes], BitReaderMode::BE);
             while br.tell() < table_bits {
                 let size                                = br.read(13 + self.channels).unwrap() as usize;
                 let pts;
@@ -471,7 +471,13 @@ impl NADecoder for RALFDecoder {
     }
 }
 
-pub fn get_decoder() -> Box<dyn NADecoder> {
+impl NAOptionHandler for RALFDecoder {
+    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() -> Box<dyn NADecoder + Send> {
     Box::new(RALFDecoder::new())
 }
 
@@ -479,19 +485,18 @@ pub fn get_decoder() -> Box<dyn NADecoder> {
 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 nihav_codec_support::test::dec_video::*;
+    use crate::realmedia_register_all_decoders;
+    use crate::realmedia_register_all_demuxers;
     #[test]
     fn test_ralf() {
         let mut dmx_reg = RegisteredDemuxers::new();
         realmedia_register_all_demuxers(&mut dmx_reg);
         let mut dec_reg = RegisteredDecoders::new();
-        realmedia_register_all_codecs(&mut dec_reg);
+        realmedia_register_all_decoders(&mut dec_reg);
 
-        let file = "assets/RV/rv40_ralf.rmvb";
-        test_decode_audio("realmedia", file, Some(2000), None/*Some("ralf")*/, &dmx_reg, &dec_reg);
-//panic!("end");
+        test_decoding("realmedia", "ralf", "assets/RV/rv40_ralf.rmvb", None, &dmx_reg, &dec_reg,
+                      ExpectedTestResult::MD5([0x6cf18361, 0x9548b5ce, 0x5dfc0b5c, 0x2bd6f392]));
     }
 }