X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-duck%2Fsrc%2Fcodecs%2Fvp6.rs;h=241a13a72ef947b3e76874de7bdb647f92026ad3;hb=586ea1879dd193fa71d16302e1c54deb269bc732;hp=fdf62527eacf66a22732a812bd6e81fff1c55765;hpb=fa90ccfb8676a917a02fbb56381f86aa1962d313;p=nihav.git diff --git a/nihav-duck/src/codecs/vp6.rs b/nihav-duck/src/codecs/vp6.rs index fdf6252..241a13a 100644 --- a/nihav-duck/src/codecs/vp6.rs +++ b/nihav-duck/src/codecs/vp6.rs @@ -1,6 +1,7 @@ use nihav_core::codecs::*; use nihav_core::io::bitreader::*; -use nihav_core::codecs::blockdsp::edge_emu; +use nihav_codec_support::codecs::{MV, ZIGZAG}; +use nihav_codec_support::codecs::blockdsp::edge_emu; use super::vpcommon::*; use super::vp56::*; @@ -556,7 +557,7 @@ fn get_block(dst: &mut [u8], dstride: usize, src: NAVideoBufferRef, comp: us if (sx - 2 < 0) || (sx + 8 + 2 > (w as isize)) || (sy - 2 < 0) || (sy + 8 + 2 > (h as isize)) { edge_emu(&src, sx - 2, sy - 2, 8 + 2 + 2, 8 + 2 + 2, - dst, dstride, comp); + dst, dstride, comp, 0); } else { let sstride = src.get_stride(comp); let soff = src.get_offset(comp); @@ -726,9 +727,9 @@ pub fn get_decoder_vp6_alpha() -> Box { mod test { use nihav_core::codecs::RegisteredDecoders; use nihav_core::demuxers::RegisteredDemuxers; - use nihav_core::test::dec_video::*; - use crate::codecs::duck_register_all_codecs; - use nihav_commonfmt::demuxers::generic_register_all_demuxers; + use nihav_codec_support::test::dec_video::*; + use crate::duck_register_all_codecs; + use nihav_commonfmt::generic_register_all_demuxers; #[test] fn test_vp6() {