X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-game%2Fsrc%2Fcodecs%2Fbmv.rs;h=e94fbaff2a28160dd8018e34c5dbf5781cf5e8e2;hb=40e5d0b8679600dad489c8c03d3e2daf6ed0ab79;hp=bdd18e49661eea472eefdc470c20abee30a6ba1f;hpb=e64739f87a35f29be0bbbce366876180ba3eb57e;p=nihav.git

diff --git a/nihav-game/src/codecs/bmv.rs b/nihav-game/src/codecs/bmv.rs
index bdd18e4..e94fbaf 100644
--- a/nihav-game/src/codecs/bmv.rs
+++ b/nihav-game/src/codecs/bmv.rs
@@ -307,7 +307,7 @@ pub fn get_decoder_audio() -> Box<dyn NADecoder + Send> {
 mod test {
     use nihav_core::codecs::RegisteredDecoders;
     use nihav_core::demuxers::RegisteredDemuxers;
-    use nihav_core::test::dec_video::*;
+    use nihav_codec_support::test::dec_video::*;
     use crate::game_register_all_codecs;
     use crate::game_register_all_demuxers;
     #[test]
@@ -317,10 +317,8 @@ mod test {
         let mut dec_reg = RegisteredDecoders::new();
         game_register_all_codecs(&mut dec_reg);
 
-//        let file = "assets/Game/PERFECT.BMV";
-//        let file = "assets/Game/DW2-MOUSE.BMV";
-        let file = "assets/Game/WILDCAT.BMV";
-        test_file_decoding("bmv", file, Some(40), true, false, None, &dmx_reg, &dec_reg);
+        test_decoding("bmv", "bmv-video", "assets/Game/WILDCAT.BMV", Some(40), &dmx_reg, &dec_reg,
+                      ExpectedTestResult::MD5([0x9e91bb16, 0xc1edafc9, 0x4ef3171f, 0x0f3f6181]));
     }
     #[test]
     fn test_bmv_audio() {
@@ -329,9 +327,7 @@ mod test {
         let mut dec_reg = RegisteredDecoders::new();
         game_register_all_codecs(&mut dec_reg);
 
-        let file = "assets/Game/PERFECT.BMV";
-//        let file = "assets/Game/DW2-MOUSE.BMV";
-//        let file = "assets/Game/WILDCAT.BMV";
-        test_decode_audio("bmv", file, None, None/*Some("bmv")*/, &dmx_reg, &dec_reg);
+        test_decoding("bmv", "bmv-audio", "assets/Game/PERFECT.BMV", None, &dmx_reg, &dec_reg,
+                      ExpectedTestResult::MD5([0x90b9ace4, 0x5fc19938, 0x7f534560, 0x32589cdf]));
     }
 }