X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-game%2Fsrc%2Fcodecs%2Fbmv.rs;h=4f6d99346fc81a630711f2b2470e96faf0bac1b9;hb=ce742854b2912b880fb3d3e330042b049dac8504;hp=f2458af2acafe42979b57d88504e2b0159213663;hpb=e69b11482edfe7d2d3604a828e46990df78ef852;p=nihav.git

diff --git a/nihav-game/src/codecs/bmv.rs b/nihav-game/src/codecs/bmv.rs
index f2458af..4f6d993 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()); },
@@ -216,10 +216,12 @@ impl NADecoder for BMVVideoDecoder {
         frm.set_frame_type(if is_intra { FrameType::I } else { FrameType::P });
         Ok(frm.into_ref())
     }
+    fn flush(&mut self) {
+    }
 }
 
 
-pub fn get_decoder_video() -> Box<dyn NADecoder> {
+pub fn get_decoder_video() -> Box<dyn NADecoder + Send> {
     Box::new(BMVVideoDecoder::new())
 }
 
@@ -293,9 +295,11 @@ impl NADecoder for BMVAudioDecoder {
             Err(DecoderError::InvalidData)
         }
     }
+    fn flush(&mut self) {
+    }
 }
 
-pub fn get_decoder_audio() -> Box<dyn NADecoder> {
+pub fn get_decoder_audio() -> Box<dyn NADecoder + Send> {
     Box::new(BMVAudioDecoder::new())
 }
 
@@ -303,9 +307,9 @@ 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_codecs;
+    use crate::game_register_all_demuxers;
     #[test]
     fn test_bmv_video() {
         let mut dmx_reg = RegisteredDemuxers::new();
@@ -328,6 +332,6 @@ mod test {
         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_decode_audio("bmv", file, None, None/*Some("bmv")*/, &dmx_reg, &dec_reg);
     }
 }