X-Git-Url: https://git.nihav.org/?p=nihav.git;a=blobdiff_plain;f=nihav-duck%2Fsrc%2Fcodecs%2Fvp6.rs;h=ca8946f5ad4d7032259c499c05dd875d3305b547;hp=ddc8e633c0595d23063528e02e62882e34f0840c;hb=b7c882c1ce6f86c07c2340751200e3a060942826;hpb=47933c6d7ef4dc3ca6d549199081c67cea324c36 diff --git a/nihav-duck/src/codecs/vp6.rs b/nihav-duck/src/codecs/vp6.rs index ddc8e63..ca8946f 100644 --- a/nihav-duck/src/codecs/vp6.rs +++ b/nihav-duck/src/codecs/vp6.rs @@ -361,7 +361,7 @@ impl VP56Parser for VP6BR { (mv.x >> 3, mv.y >> 3, mv.x & 7, mv.y & 7, mv.x / 8, mv.y / 8) }; let tmp_blk = mc_buf.get_data_mut().unwrap(); - get_block(tmp_blk, 16, src.clone(), plane, x, y, sx, sy); + get_block(tmp_blk, 16, src, plane, x, y, sx, sy); if (msx & 7) != 0 { let foff = (8 - (sx & 7)) as usize; let off = 2 + foff; @@ -720,11 +720,11 @@ impl NAOptionHandler for VP6Decoder { fn query_option_value(&self, _name: &str) -> Option { None } } -pub fn get_decoder_vp6() -> Box { +pub fn get_decoder_vp6() -> Box { Box::new(VP6Decoder::new(false)) } -pub fn get_decoder_vp6_alpha() -> Box { +pub fn get_decoder_vp6_alpha() -> Box { Box::new(VP6Decoder::new(true)) } @@ -733,7 +733,7 @@ mod test { use nihav_core::codecs::RegisteredDecoders; use nihav_core::demuxers::RegisteredDemuxers; use nihav_codec_support::test::dec_video::*; - use crate::duck_register_all_codecs; + use crate::duck_register_all_decoders; use nihav_commonfmt::generic_register_all_demuxers; #[test] @@ -741,7 +741,7 @@ mod test { let mut dmx_reg = RegisteredDemuxers::new(); generic_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - duck_register_all_codecs(&mut dec_reg); + duck_register_all_decoders(&mut dec_reg); test_decoding("avi", "vp6", "assets/Duck/selection_720x576_300kBit_vp60i.avi", Some(16), &dmx_reg, &dec_reg, @@ -752,7 +752,7 @@ mod test { let mut dmx_reg = RegisteredDemuxers::new(); generic_register_all_demuxers(&mut dmx_reg); let mut dec_reg = RegisteredDecoders::new(); - duck_register_all_codecs(&mut dec_reg); + duck_register_all_decoders(&mut dec_reg); test_decoding("avi", "vp6", "assets/Duck/vp6_crash.avi", Some(4), &dmx_reg, &dec_reg, ExpectedTestResult::MD5Frames(vec![