}
validate!(val >= 2);
let len = (val >> 1) - 1;
-
+
match mode {
1 => bw.copy(len),
2 => for _ in 0..len { bw.put_byte(br.get_byte()); },
}
-pub fn get_decoder_video() -> Box<dyn NADecoder> {
+pub fn get_decoder_video() -> Box<dyn NADecoder + Send> {
Box::new(BMVVideoDecoder::new())
}
}
}
-pub fn get_decoder_audio() -> Box<dyn NADecoder> {
+pub fn get_decoder_audio() -> Box<dyn NADecoder + Send> {
Box::new(BMVAudioDecoder::new())
}
mod test {
use nihav_core::codecs::RegisteredDecoders;
use nihav_core::demuxers::RegisteredDemuxers;
- use nihav_core::test::dec_video::*;
- use crate::codecs::game_register_all_codecs;
- use crate::demuxers::game_register_all_demuxers;
+ use nihav_codec_support::test::dec_video::*;
+ use crate::game_register_all_codecs;
+ use crate::game_register_all_demuxers;
#[test]
fn test_bmv_video() {
let mut dmx_reg = RegisteredDemuxers::new();
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() {
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, "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]));
}
}