X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;ds=sidebyside;f=nihav-game%2Fsrc%2Fcodecs%2Fbmv3.rs;h=3fafb6d38dcb088a374bc5323d7e6ddfe3e9cd36;hb=e64739f87a35f29be0bbbce366876180ba3eb57e;hp=efc3c7edde037f0ba83008cb6e60d11fcaf33724;hpb=e69b11482edfe7d2d3604a828e46990df78ef852;p=nihav.git diff --git a/nihav-game/src/codecs/bmv3.rs b/nihav-game/src/codecs/bmv3.rs index efc3c7e..3fafb6d 100644 --- a/nihav-game/src/codecs/bmv3.rs +++ b/nihav-game/src/codecs/bmv3.rs @@ -499,10 +499,12 @@ 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) { + } } -pub fn get_decoder_video() -> Box { +pub fn get_decoder_video() -> Box { Box::new(BMV3VideoDecoder::new()) } @@ -589,9 +591,11 @@ impl NADecoder for BMV3AudioDecoder { Err(DecoderError::InvalidData) } } + fn flush(&mut self) { + } } -pub fn get_decoder_audio() -> Box { +pub fn get_decoder_audio() -> Box { Box::new(BMV3AudioDecoder::new()) } @@ -600,8 +604,8 @@ 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 crate::game_register_all_codecs; + use crate::game_register_all_demuxers; #[test] fn test_bmv_video() { let mut dmx_reg = RegisteredDemuxers::new(); @@ -620,7 +624,7 @@ mod test { game_register_all_codecs(&mut dec_reg); let file = "assets/Game/DW3-Loffnote.bmv"; - test_decode_audio("bmv3", file, None, "bmv3", &dmx_reg, &dec_reg); + test_decode_audio("bmv3", file, None, None/*Some("bmv3")*/, &dmx_reg, &dec_reg); } }