X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-game%2Fsrc%2Fcodecs%2Fmidivid.rs;h=30f069fd3aacf1eb696ba7a91beefb9dd11ee055;hb=ce742854b2912b880fb3d3e330042b049dac8504;hp=037248fc8c11630e0fd96d157cc824bdad247cfe;hpb=f9be4e750dccff762b9a3d894faec50ffdb59233;p=nihav.git diff --git a/nihav-game/src/codecs/midivid.rs b/nihav-game/src/codecs/midivid.rs index 037248f..30f069f 100644 --- a/nihav-game/src/codecs/midivid.rs +++ b/nihav-game/src/codecs/midivid.rs @@ -1,5 +1,6 @@ use nihav_core::codecs::*; use nihav_core::io::byteio::*; +use nihav_codec_support::codecs::HAMShuffler; #[derive(Default)] struct MidividDecoder { @@ -92,7 +93,7 @@ fn decode_frame(frm: &mut NASimpleVideoFrame, src: &[u8], width: usize, heig idx_br.read_byte()? as usize } else { if bits == 0 { - hi9 = idx9_br.read_byte()?; + hi9 = idx9_br.read_byte()?; bits = 8; } bits -= 1; @@ -112,7 +113,7 @@ fn decode_frame(frm: &mut NASimpleVideoFrame, src: &[u8], width: usize, heig } } } - + Ok(is_intra) } @@ -175,7 +176,7 @@ impl NADecoder for MidividDecoder { } -pub fn get_decoder_video() -> Box { +pub fn get_decoder_video() -> Box { Box::new(MidividDecoder::new()) } @@ -183,9 +184,9 @@ pub fn get_decoder_video() -> Box { 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 nihav_commonfmt::demuxers::generic_register_all_demuxers; + use nihav_codec_support::test::dec_video::*; + use crate::game_register_all_codecs; + use nihav_commonfmt::generic_register_all_demuxers; #[test] fn test_midivid_video() { let mut dmx_reg = RegisteredDemuxers::new();