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

diff --git a/nihav-game/src/codecs/bmv.rs b/nihav-game/src/codecs/bmv.rs
index 2e42390..ac487b0 100644
--- a/nihav-game/src/codecs/bmv.rs
+++ b/nihav-game/src/codecs/bmv.rs
@@ -25,6 +25,7 @@ impl<'a> BMVReader<'a> {
         let pos = if fwd { 0 } else { src.len() - 1 };
         Self { src, pos, fwd, nibble: 0, saved: false }
     }
+    #[allow(clippy::collapsible_else_if)]
     fn advance(&mut self) {
         if self.fwd {
             if self.pos < self.src.len() - 1 { self.pos += 1; }
@@ -69,6 +70,7 @@ impl<'a> BMVWriter<'a> {
             self.pos == 0
         }
     }
+    #[allow(clippy::collapsible_else_if)]
     fn advance(&mut self) {
         if self.fwd {
             if self.pos < self.data.len() - 1 { self.pos += 1; }
@@ -320,14 +322,15 @@ 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;
+    // 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);
 
         test_decoding("bmv", "bmv-video", "assets/Game/WILDCAT.BMV", Some(40), &dmx_reg, &dec_reg,
                       ExpectedTestResult::MD5([0x9e91bb16, 0xc1edafc9, 0x4ef3171f, 0x0f3f6181]));
@@ -337,7 +340,7 @@ mod test {
         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);
 
         test_decoding("bmv", "bmv-audio", "assets/Game/PERFECT.BMV", None, &dmx_reg, &dec_reg,
                       ExpectedTestResult::MD5([0x90b9ace4, 0x5fc19938, 0x7f534560, 0x32589cdf]));