X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-ms%2Fsrc%2Fcodecs%2Fmsrle.rs;h=1cc330865c390e152e055d2c26d610b992d43d59;hb=237cc1f9576ed23c7a2f9bb34b43e5d07e93f710;hp=0c2fc9c0aa94ff7010fef1623bf173db0998ef4a;hpb=8d7a1c5c2b1c41d284cbe7ab3d3ee344755db7bc;p=nihav.git diff --git a/nihav-ms/src/codecs/msrle.rs b/nihav-ms/src/codecs/msrle.rs index 0c2fc9c..1cc3308 100644 --- a/nihav-ms/src/codecs/msrle.rs +++ b/nihav-ms/src/codecs/msrle.rs @@ -82,7 +82,7 @@ impl RleDecoder { } } } - + Ok(if has_skips { FrameType::P } else { FrameType::I }) } @@ -175,7 +175,6 @@ impl RleDecoder { } } } - Ok(if has_skips { FrameType::P } else { FrameType::I }) } @@ -260,14 +259,14 @@ mod test { use nihav_core::codecs::RegisteredDecoders; use nihav_core::demuxers::RegisteredDemuxers; use nihav_codec_support::test::dec_video::*; - use crate::ms_register_all_codecs; + use crate::ms_register_all_decoders; use nihav_commonfmt::generic_register_all_demuxers; #[test] fn test_ms_rle_8bit() { let mut dmx_reg = RegisteredDemuxers::new(); generic_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - ms_register_all_codecs(&mut dec_reg); + ms_register_all_decoders(&mut dec_reg); test_decoding("avi", "msrle", "assets/MS/workcycl-64color.avi", Some(6), &dmx_reg, &dec_reg, ExpectedTestResult::MD5Frames(vec![ @@ -284,7 +283,7 @@ mod test { let mut dmx_reg = RegisteredDemuxers::new(); generic_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - ms_register_all_codecs(&mut dec_reg); + ms_register_all_decoders(&mut dec_reg); test_decoding("avi", "msrle", "assets/MS/suzie_appl_rle8.avi", Some(2), &dmx_reg, &dec_reg, ExpectedTestResult::MD5Frames(vec![ @@ -297,7 +296,7 @@ mod test { let mut dmx_reg = RegisteredDemuxers::new(); generic_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - ms_register_all_codecs(&mut dec_reg); + ms_register_all_decoders(&mut dec_reg); test_decoding("avi", "msrle", "assets/MS/mplayer-msrle-4bit.avi", Some(2), &dmx_reg, &dec_reg, ExpectedTestResult::MD5Frames(vec![ @@ -310,7 +309,7 @@ mod test { let mut dmx_reg = RegisteredDemuxers::new(); generic_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - ms_register_all_codecs(&mut dec_reg); + ms_register_all_decoders(&mut dec_reg); test_decoding("avi", "msrle", "assets/MS/suzie_appl_rle4.avi", Some(2), &dmx_reg, &dec_reg, ExpectedTestResult::MD5([0xb5d38296, 0xdae25407, 0x985973f0, 0xb1da9c94]));