X-Git-Url: https://git.nihav.org/?p=nihav.git;a=blobdiff_plain;f=nihav-game%2Fsrc%2Fcodecs%2Fbmv3.rs;h=0140c8c4498d31371018b46a853bb7faec336011;hp=a9d7f71e9222f00cdf292babda4f6a4b0e0d262b;hb=78fb6560c73965d834b215fb0b49505ae5443288;hpb=7d57ae2f680d7a1eba7af2ee831f305b2f0f9324 diff --git a/nihav-game/src/codecs/bmv3.rs b/nihav-game/src/codecs/bmv3.rs index a9d7f71..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 { @@ -532,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; @@ -616,14 +618,14 @@ 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); test_decoding("bmv3", "bmv3-video", "assets/Game/DW3-Loffnote.bmv", None, &dmx_reg, &dec_reg, ExpectedTestResult::MD5([0xfa34b81b, 0xd0ab79e2, 0x78fb25cc, 0x98ae47ff])); @@ -633,7 +635,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("bmv3", "bmv3-audio", "assets/Game/DW3-Loffnote.bmv", None, &dmx_reg, &dec_reg, ExpectedTestResult::MD5([0xd8e743cc, 0x97604bd7, 0x8dbb89c6, 0xb34cad63]));