X-Git-Url: https://git.nihav.org/?p=nihav.git;a=blobdiff_plain;f=nihav-game%2Fsrc%2Fcodecs%2Fbmv3.rs;h=0140c8c4498d31371018b46a853bb7faec336011;hp=48391c96dd5794d75413f5f46925b77d64a4decc;hb=78fb6560c73965d834b215fb0b49505ae5443288;hpb=ce742854b2912b880fb3d3e330042b049dac8504

diff --git a/nihav-game/src/codecs/bmv3.rs b/nihav-game/src/codecs/bmv3.rs
index 48391c9..0140c8c 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 {
@@ -503,6 +504,12 @@ impl NADecoder for BMV3VideoDecoder {
     }
 }
 
+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 + Send> {
     Box::new(BMV3VideoDecoder::new())
@@ -526,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;
@@ -595,6 +603,12 @@ impl NADecoder for BMV3AudioDecoder {
     }
 }
 
+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 + Send> {
     Box::new(BMV3AudioDecoder::new())
 }
@@ -604,27 +618,27 @@ mod test {
     use nihav_core::codecs::RegisteredDecoders;
     use nihav_core::demuxers::RegisteredDemuxers;
     use nihav_codec_support::test::dec_video::*;
-    use crate::game_register_all_codecs;
+    use crate::game_register_all_decoders;
     use crate::game_register_all_demuxers;
     #[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, None/*Some("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]));
     }
 }