X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-duck%2Fsrc%2Fcodecs%2Fvp5.rs;h=eb394687fcb5978589426b4a2670372b87b46512;hb=ce742854b2912b880fb3d3e330042b049dac8504;hp=c520b96b61c0e333bcfd6b0b2cfa52fc1f653dca;hpb=d5e94eafdc4c4d4d78eae39610f00d0cc03f2854;p=nihav.git diff --git a/nihav-duck/src/codecs/vp5.rs b/nihav-duck/src/codecs/vp5.rs index c520b96..eb39468 100644 --- a/nihav-duck/src/codecs/vp5.rs +++ b/nihav-duck/src/codecs/vp5.rs @@ -1,5 +1,6 @@ use nihav_core::codecs::*; use nihav_core::io::bitreader::*; +use nihav_codec_support::codecs::{MV, ZIGZAG}; use super::vpcommon::*; use super::vp56::*; @@ -32,7 +33,7 @@ impl VP56Parser for VP5BR { validate!((hdr.disp_w <= hdr.mb_w) && (hdr.disp_h <= hdr.mb_h)); hdr.scale = bc.read_bits(2) as u8; } - + Ok(hdr) } fn decode_mv(&self, bc: &mut BoolCoder, model: &VP56MVModel) -> i16 { @@ -192,7 +193,7 @@ impl VP56Parser for VP5BR { if idx > 0 { coeffs[ZIGZAG[idx]] *= fstate.ac_quant; } - + idx += 1; if idx >= 64 { break; @@ -285,9 +286,9 @@ pub fn get_decoder() -> 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_vp5() {