X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-ms%2Fsrc%2Fcodecs%2Fmsrle.rs;h=8637e039bb94be2042edb6b476ac3112ea0bca49;hb=886cde4847280b96e10d240c2f2d76abec121dc8;hp=8ebdd567cb2fca05fea5819e93bc71071e194bce;hpb=423005dc1d521e9089c9ddcf020979b825e30443;p=nihav.git

diff --git a/nihav-ms/src/codecs/msrle.rs b/nihav-ms/src/codecs/msrle.rs
index 8ebdd56..8637e03 100644
--- a/nihav-ms/src/codecs/msrle.rs
+++ b/nihav-ms/src/codecs/msrle.rs
@@ -5,7 +5,7 @@ use nihav_codec_support::codecs::HAMShuffler;
 #[derive(Default)]
 struct RleDecoder {
     info:       NACodecInfoRef,
-    hams:       HAMShuffler,
+    hams:       HAMShuffler<u8>,
     width:      usize,
     height:     usize,
     is_4bit:    bool,
@@ -82,7 +82,7 @@ impl RleDecoder {
                 }
             }
         }
-        
+
 
         Ok(if has_skips { FrameType::P } else { FrameType::I })
     }
@@ -175,7 +175,6 @@ impl RleDecoder {
                 }
             }
         }
-        
 
         Ok(if has_skips { FrameType::P } else { FrameType::I })
     }
@@ -260,14 +259,15 @@ mod test {
     use nihav_core::codecs::RegisteredDecoders;
     use nihav_core::demuxers::RegisteredDemuxers;
     use nihav_codec_support::test::dec_video::*;
-    use crate::ms_register_all_codecs;
+    use crate::ms_register_all_decoders;
     use nihav_commonfmt::generic_register_all_demuxers;
+    // samples from https://samples.mplayerhq.hu/V-codecs/RLE
     #[test]
     fn test_ms_rle_8bit() {
         let mut dmx_reg = RegisteredDemuxers::new();
         generic_register_all_demuxers(&mut dmx_reg);
         let mut dec_reg = RegisteredDecoders::new();
-        ms_register_all_codecs(&mut dec_reg);
+        ms_register_all_decoders(&mut dec_reg);
 
         test_decoding("avi", "msrle", "assets/MS/workcycl-64color.avi", Some(6), &dmx_reg, &dec_reg,
                       ExpectedTestResult::MD5Frames(vec![
@@ -284,7 +284,7 @@ mod test {
         let mut dmx_reg = RegisteredDemuxers::new();
         generic_register_all_demuxers(&mut dmx_reg);
         let mut dec_reg = RegisteredDecoders::new();
-        ms_register_all_codecs(&mut dec_reg);
+        ms_register_all_decoders(&mut dec_reg);
 
         test_decoding("avi", "msrle", "assets/MS/suzie_appl_rle8.avi", Some(2), &dmx_reg, &dec_reg,
                       ExpectedTestResult::MD5Frames(vec![
@@ -297,7 +297,7 @@ mod test {
         let mut dmx_reg = RegisteredDemuxers::new();
         generic_register_all_demuxers(&mut dmx_reg);
         let mut dec_reg = RegisteredDecoders::new();
-        ms_register_all_codecs(&mut dec_reg);
+        ms_register_all_decoders(&mut dec_reg);
 
         test_decoding("avi", "msrle", "assets/MS/mplayer-msrle-4bit.avi", Some(2), &dmx_reg, &dec_reg,
                       ExpectedTestResult::MD5Frames(vec![
@@ -310,7 +310,7 @@ mod test {
         let mut dmx_reg = RegisteredDemuxers::new();
         generic_register_all_demuxers(&mut dmx_reg);
         let mut dec_reg = RegisteredDecoders::new();
-        ms_register_all_codecs(&mut dec_reg);
+        ms_register_all_decoders(&mut dec_reg);
 
         test_decoding("avi", "msrle", "assets/MS/suzie_appl_rle4.avi", Some(2), &dmx_reg, &dec_reg,
                       ExpectedTestResult::MD5([0xb5d38296, 0xdae25407, 0x985973f0, 0xb1da9c94]));