X-Git-Url: https://git.nihav.org/?p=nihav.git;a=blobdiff_plain;f=nihav-game%2Fsrc%2Fcodecs%2Fbmv.rs;h=31fd8556f495d141d0529ed36a3fcd1d872516f3;hp=4417fb79057b07671bc47a71f94ccd3bbe09d88e;hb=HEAD;hpb=5580b11b0e9daf065c81a8b354295c6d5d1dd3dd

diff --git a/nihav-game/src/codecs/bmv.rs b/nihav-game/src/codecs/bmv.rs
index 4417fb7..31fd855 100644
--- a/nihav-game/src/codecs/bmv.rs
+++ b/nihav-game/src/codecs/bmv.rs
@@ -142,7 +142,7 @@ impl BMVVideoDecoder {
             }
             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()); },
@@ -220,8 +220,14 @@ impl NADecoder for BMVVideoDecoder {
     }
 }
 
+impl NAOptionHandler for BMVVideoDecoder {
+    fn get_supported_options(&self) -> &[NAOptionDefinition] { &[] }
+    fn set_options(&mut self, _options: &[NAOption]) { }
+    fn query_option_value(&self, _name: &str) -> Option<NAValue> { None }
+}
+
 
-pub fn get_decoder_video() -> Box<dyn NADecoder> {
+pub fn get_decoder_video() -> Box<dyn NADecoder + Send> {
     Box::new(BMVVideoDecoder::new())
 }
 
@@ -299,7 +305,13 @@ impl NADecoder for BMVAudioDecoder {
     }
 }
 
-pub fn get_decoder_audio() -> Box<dyn NADecoder> {
+impl NAOptionHandler for BMVAudioDecoder {
+    fn get_supported_options(&self) -> &[NAOptionDefinition] { &[] }
+    fn set_options(&mut self, _options: &[NAOption]) { }
+    fn query_option_value(&self, _name: &str) -> Option<NAValue> { None }
+}
+
+pub fn get_decoder_audio() -> Box<dyn NADecoder + Send> {
     Box::new(BMVAudioDecoder::new())
 }
 
@@ -307,31 +319,28 @@ pub fn get_decoder_audio() -> Box<dyn NADecoder> {
 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_decoders;
+    use crate::game_register_all_demuxers;
+    // samples from: https://samples.mplayerhq.hu/game-formats/bmv/
     #[test]
     fn test_bmv_video() {
         let mut dmx_reg = RegisteredDemuxers::new();
         game_register_all_demuxers(&mut dmx_reg);
         let mut dec_reg = RegisteredDecoders::new();
-        game_register_all_codecs(&mut dec_reg);
+        game_register_all_decoders(&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 dmx_reg = RegisteredDemuxers::new();
         game_register_all_demuxers(&mut dmx_reg);
         let mut dec_reg = RegisteredDecoders::new();
-        game_register_all_codecs(&mut dec_reg);
+        game_register_all_decoders(&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]));
     }
 }