X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-duck%2Fsrc%2Fcodecs%2Fvp6.rs;h=4f014faf13cbad7f53498cb527ddb9a9ac6edff3;hb=2949bcfa141c1f25b9b1b4d5c346acc9cc3b0a2a;hp=da0fe400d1e93f31d003ccf6388dd9cbb10e87ce;hpb=e64739f87a35f29be0bbbce366876180ba3eb57e;p=nihav.git diff --git a/nihav-duck/src/codecs/vp6.rs b/nihav-duck/src/codecs/vp6.rs index da0fe40..4f014fa 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); @@ -714,6 +715,12 @@ impl NADecoder for VP6Decoder { } } +impl NAOptionHandler for VP6Decoder { + fn get_supported_options(&self) -> &[NAOptionDefinition] { &[] } + fn set_options(&mut self, _options: &[NAOption]) { } + fn query_option_value(&self, _name: &str) -> Option { None } +} + pub fn get_decoder_vp6() -> Box { Box::new(VP6Decoder::new(false)) } @@ -726,7 +733,7 @@ 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 nihav_codec_support::test::dec_video::*; use crate::duck_register_all_codecs; use nihav_commonfmt::generic_register_all_demuxers;