rename register_all_codecs to register_all_decoders

[nihav.git] / nihav-realmedia / src / codecs / rv60.rs

diff --git a/nihav-realmedia/src/codecs/rv60.rs b/nihav-realmedia/src/codecs/rv60.rs
index 2810b3ab8a00861e2bb9da9ed3356f2de5800d0d..d1e7c53dada77d102a882dfa013cf532ae36f270 100644 (file)
--- a/nihav-realmedia/src/codecs/rv60.rs
+++ b/nihav-realmedia/src/codecs/rv60.rs
@@ -222,7 +222,7 @@ const RV60_BLOCK_LOG2: [u8; 65] = [
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6
 ];
 const RV60_AVAIL_MASK: [u8; 64] = [
-    0, 1, 0, 3, 0, 1, 0, 7, 0, 1, 0, 3, 0, 1, 0, 0,
+    0, 1, 0, 3, 0, 1, 0, 7, 0, 1, 0, 3, 0, 1, 0, 0xF,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
@@ -728,6 +728,7 @@ println!(" left {} bits", br.left());
 }
         Ok(())
     }
+    #[allow(clippy::cyclomatic_complexity)]
     fn decode_cb_tree(&mut self, buf: &mut NASimpleVideoFrame<u8>, hdr: &FrameHeader, br: &mut BitReader, xpos: usize, ypos: usize, log_size: u8) -> DecoderResult<()> {
         if (xpos >= hdr.width) || (ypos >= hdr.height) { return Ok(()); }
 
@@ -1588,16 +1589,29 @@ mod test {
     use nihav_core::codecs::RegisteredDecoders;
     use nihav_core::demuxers::RegisteredDemuxers;
     use nihav_codec_support::test::dec_video::*;
-    use crate::realmedia_register_all_codecs;
+    use crate::realmedia_register_all_decoders;
     use crate::realmedia_register_all_demuxers;
     #[test]
     fn test_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");
+        realmedia_register_all_decoders(&mut dec_reg);
+
+        test_decoding("realmedia", "realvideo6", "assets/RV/RV60.rmhd", Some(1000), &dmx_reg, &dec_reg,
+                      ExpectedTestResult::MD5Frames(vec![
+                            [0x2b1f1807, 0x09edef33, 0x0e6c78c1, 0x3b3c8179],
+                            [0xea406850, 0x400802b8, 0xac106fb6, 0xe1e2e766],
+                            [0x2b1f1807, 0x09edef33, 0x0e6c78c1, 0x3b3c8179],
+                            [0xb04e2626, 0x976e16f5, 0xc41a7a78, 0x2d8765da],
+                            [0xf4f30d97, 0x7f2876eb, 0x265ffad4, 0x3542a7c4],
+                            [0xa5082524, 0x38a86952, 0x35bf1fee, 0xfc830d3f],
+                            [0x75eab1a2, 0x62e2222f, 0xe96a20d9, 0x652140b4],
+                            [0x7590fa49, 0x78c83490, 0x239eeff9, 0x64282ac7],
+                            [0x70b19e9f, 0x66c1f866, 0xb8d7142a, 0xf3e424b2],
+                            [0xc2934123, 0x3bf72fc4, 0x12d8d123, 0x1f39525b],
+                            [0x13344919, 0xecd01190, 0x2f69079b, 0xbf4d7026],
+                            [0xcefb3284, 0xa9b36d4d, 0xf1aa6752, 0xaae17d44],
+                            [0x57f01275, 0xf8e883ea, 0x4865752e, 0xc760a777]]));
     }
 }