X-Git-Url: https://git.nihav.org/?p=nihav.git;a=blobdiff_plain;f=nihav-game%2Fsrc%2Fcodecs%2Fbmv3.rs;h=525273dd7f15d87459335251d8f31d7e6b9b8ec0;hp=efc3c7edde037f0ba83008cb6e60d11fcaf33724;hb=HEAD;hpb=e69b11482edfe7d2d3604a828e46990df78ef852

diff --git a/nihav-game/src/codecs/bmv3.rs b/nihav-game/src/codecs/bmv3.rs
index efc3c7e..525273d 100644
--- a/nihav-game/src/codecs/bmv3.rs
+++ b/nihav-game/src/codecs/bmv3.rs
@@ -110,6 +110,7 @@ impl BMV3VideoDecoder {
             is_intra:   false,
         }
     }
+    #[allow(clippy::identity_op)]
     fn decode_frame(&mut self, br: &mut ByteReader) -> DecoderResult<()> {
         let mut idx = 0;
         loop {
@@ -499,10 +500,18 @@ impl NADecoder for BMV3VideoDecoder {
         frm.set_frame_type(if self.is_intra { FrameType::I } else { FrameType::P });
         Ok(frm.into_ref())
     }
+    fn flush(&mut self) {
+    }
+}
+
+impl NAOptionHandler for BMV3VideoDecoder {
+    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(BMV3VideoDecoder::new())
 }
 
@@ -524,6 +533,7 @@ impl BMV3AudioDecoder {
     }
 }
 
+#[allow(clippy::identity_op)]
 fn decode_block(mode: u8, src: &[u8], dst: &mut [i16], mut pred: i16) -> i16 {
     let steps = &BMV_AUDIO_STEPS[mode as usize];
     let mut val2 = 0;
@@ -589,9 +599,17 @@ impl NADecoder for BMV3AudioDecoder {
             Err(DecoderError::InvalidData)
         }
     }
+    fn flush(&mut self) {
+    }
+}
+
+impl NAOptionHandler for BMV3AudioDecoder {
+    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> {
+pub fn get_decoder_audio() -> Box<dyn NADecoder + Send> {
     Box::new(BMV3AudioDecoder::new())
 }
 
@@ -599,28 +617,29 @@ 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;
+    // sample: https://samples.mplayerhq.hu/game-formats/bmv/DW3-Loffnote.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/DW3-Loffnote.bmv";
-        test_file_decoding("bmv3", file, None, true, false, None, &dmx_reg, &dec_reg);
+        test_decoding("bmv3", "bmv3-video", "assets/Game/DW3-Loffnote.bmv", None, &dmx_reg, &dec_reg,
+                      ExpectedTestResult::MD5([0xfa34b81b, 0xd0ab79e2, 0x78fb25cc, 0x98ae47ff]));
     }
     #[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/DW3-Loffnote.bmv";
-        test_decode_audio("bmv3", file, None, "bmv3", &dmx_reg, &dec_reg);
+        test_decoding("bmv3", "bmv3-audio", "assets/Game/DW3-Loffnote.bmv", None, &dmx_reg, &dec_reg,
+                      ExpectedTestResult::MD5([0xd8e743cc, 0x97604bd7, 0x8dbb89c6, 0xb34cad63]));
     }
 }