X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-realmedia%2Fsrc%2Fcodecs%2Frv60.rs;h=cf09845ef9b2f1851a0aa6ea3adea3d0c7b9c5ad;hb=e2392676887847227d2f3a65b7e6ed4f453d2897;hp=20a0f7ac92b2e4cd3c930d1d73d6e7096908ba17;hpb=5641dccfbf2a70d589cf094a0d4ed5a10f919f00;p=nihav.git

diff --git a/nihav-realmedia/src/codecs/rv60.rs b/nihav-realmedia/src/codecs/rv60.rs
index 20a0f7a..cf09845 100644
--- a/nihav-realmedia/src/codecs/rv60.rs
+++ b/nihav-realmedia/src/codecs/rv60.rs
@@ -643,7 +643,7 @@ struct RealVideo60Decoder {
 impl RealVideo60Decoder {
     fn new() -> Self {
         let tmp_vinfo = NAVideoInfo::new(64, 64, false, YUV420_FORMAT);
-        let mut vt = alloc_video_buffer(tmp_vinfo, 4).unwrap();
+        let vt = alloc_video_buffer(tmp_vinfo, 4).unwrap();
         let vb = vt.get_vbuf();
         let avg_buf = vb.unwrap();
         RealVideo60Decoder{
@@ -1445,7 +1445,7 @@ println!("???");
         let tmp_vinfo = NAVideoInfo::new(hdr.width, hdr.height, false, YUV420_FORMAT);
         let res = alloc_video_buffer(tmp_vinfo, 6);
         if !res.is_ok() { return Err(DecoderError::InvalidData); }
-        let mut bufinfo = res.unwrap();
+        let bufinfo = res.unwrap();
         let mut buf = bufinfo.get_vbuf().unwrap();
 
         let cu_w = hdr.get_width_cu();
@@ -1481,10 +1481,19 @@ pub fn get_decoder() -> Box<NADecoder> {
 
 #[cfg(test)]
 mod test {
-    use crate::test::dec_video::test_file_decoding;
+    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;
     #[test]
     fn test_rv60() {
-         test_file_decoding("realmedia", "assets/RV/RV60.rmhd", Some(4000), true, false, None/*Some("rv60")*/);
+        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);
+
+        test_file_decoding("realmedia", "assets/RV/RV60.rmhd", Some(4000), true, false, None/*Some("rv60")*/, &dmx_reg, &dec_reg);
 //panic!("end");
     }
 }