diff options
| author | Kostya Shishkov <kostya.shishkov@gmail.com> | 2024-06-26 18:56:32 +0200 |
|---|---|---|
| committer | Kostya Shishkov <kostya.shishkov@gmail.com> | 2024-06-26 18:56:32 +0200 |
| commit | 3900194bcd88993d828dd56a30018e4b47bce6e0 (patch) | |
| tree | 043542b5c4dcccea05183f2edde3461072630db7 | |
| parent | 5ebc04f1a78b84cdd0d35ab30afc3d84bf7f0ad5 (diff) | |
| download | nihav-3900194bcd88993d828dd56a30018e4b47bce6e0.tar.gz | |
vmd: move samples into subdirectory
| -rw-r--r-- | nihav-game/src/codecs/vmd.rs | 14 | ||||
| -rw-r--r-- | nihav-game/src/demuxers/vmd.rs | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/nihav-game/src/codecs/vmd.rs b/nihav-game/src/codecs/vmd.rs index 9492c62..bbca21e 100644 --- a/nihav-game/src/codecs/vmd.rs +++ b/nihav-game/src/codecs/vmd.rs @@ -700,7 +700,7 @@ mod test { let mut dec_reg = RegisteredDecoders::new(); game_register_all_decoders(&mut dec_reg); - test_decoding("vmd", "vmd-video", "assets/Game/2832.VMD", Some(10), &dmx_reg, &dec_reg, + test_decoding("vmd", "vmd-video", "assets/Game/sierra/2832.VMD", Some(10), &dmx_reg, &dec_reg, ExpectedTestResult::MD5Frames(vec![ [0xd29e0214, 0xf38ad154, 0xccbd381f, 0x3de1109c], [0x904074eb, 0x202b1d6f, 0xe3f68538, 0xf0db641c], @@ -721,7 +721,7 @@ mod test { let mut dec_reg = RegisteredDecoders::new(); game_register_all_decoders(&mut dec_reg); - test_decoding("vmd", "vmd-video", "assets/Game/HLP1000.VMD", Some(10), &dmx_reg, &dec_reg, + test_decoding("vmd", "vmd-video", "assets/Game/sierra/HLP1000.VMD", Some(10), &dmx_reg, &dec_reg, ExpectedTestResult::MD5Frames(vec![ [0x03d77d51, 0x8670ae24, 0x86184cc8, 0x9c928700], [0xf4796f1b, 0x0f75a120, 0x62056509, 0xc83f1a2c], @@ -737,7 +737,7 @@ mod test { let mut dec_reg = RegisteredDecoders::new(); game_register_all_decoders(&mut dec_reg); - test_decoding("vmd", "vmd-video", "assets/Game/02C.VMD", None, &dmx_reg, &dec_reg, + test_decoding("vmd", "vmd-video", "assets/Game/sierra/02C.VMD", None, &dmx_reg, &dec_reg, ExpectedTestResult::MD5([0xb580782c, 0xd7fb98c0, 0xaf9b83cc, 0xaea0846b])); } #[test] @@ -747,7 +747,7 @@ mod test { let mut dec_reg = RegisteredDecoders::new(); game_register_all_decoders(&mut dec_reg); - test_decoding("vmd", "vmd-audio", "assets/Game/1491.VMD", None, &dmx_reg, &dec_reg, + test_decoding("vmd", "vmd-audio", "assets/Game/sierra/1491.VMD", None, &dmx_reg, &dec_reg, ExpectedTestResult::MD5([0x75037601, 0xbc7b3976, 0x6e1c948b, 0xf05a3d6c])); } #[test] @@ -757,7 +757,7 @@ mod test { let mut dec_reg = RegisteredDecoders::new(); game_register_all_decoders(&mut dec_reg); - test_decoding("vmd", "vmd-audio", "assets/Game/2832.VMD", None, &dmx_reg, &dec_reg, + test_decoding("vmd", "vmd-audio", "assets/Game/sierra/2832.VMD", None, &dmx_reg, &dec_reg, ExpectedTestResult::MD5([0x32dcdf0e, 0xee058684, 0x43ed5bf1, 0x2ff18b5a])); } #[test] @@ -767,7 +767,7 @@ mod test { let mut dec_reg = RegisteredDecoders::new(); game_register_all_decoders(&mut dec_reg); - test_decoding("vmd", "vmd-audio", "assets/Game/1000.VMD", None, &dmx_reg, &dec_reg, + test_decoding("vmd", "vmd-audio", "assets/Game/sierra/1000.VMD", None, &dmx_reg, &dec_reg, ExpectedTestResult::MD5([0xc36215d3, 0x96530a80, 0x89f1fa8e, 0x49da302b])); } #[test] @@ -777,7 +777,7 @@ mod test { let mut dec_reg = RegisteredDecoders::new(); game_register_all_decoders(&mut dec_reg); - test_decoding("vmd", "vmd-audio", "assets/Game/HLP1000.VMD", None, &dmx_reg, &dec_reg, + test_decoding("vmd", "vmd-audio", "assets/Game/sierra/HLP1000.VMD", None, &dmx_reg, &dec_reg, ExpectedTestResult::MD5([0x76a00405, 0xe4e5378d, 0x495b2a68, 0x4dffe042])); } } diff --git a/nihav-game/src/demuxers/vmd.rs b/nihav-game/src/demuxers/vmd.rs index 3341fd1..cf73654 100644 --- a/nihav-game/src/demuxers/vmd.rs +++ b/nihav-game/src/demuxers/vmd.rs @@ -223,7 +223,7 @@ mod test { #[test] fn test_vmd_demux() { // sample: https://samples.mplayerhq.hu/game-formats/sierra-vmd/Lighthouse/128.vmd - let mut file = File::open("assets/Game/128.vmd").unwrap(); + let mut file = File::open("assets/Game/sierra/128.vmd").unwrap(); //let mut file = File::open("assets/Game/1491.VMD").unwrap(); let mut fr = FileReader::new_read(&mut file); let mut br = ByteReader::new(&mut fr); |