X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-duck%2Fsrc%2Fcodecs%2Fvpcommon.rs;h=f41b89b1b5ebaefefe7f9c5b39c71eb93aed40a0;hb=4998874b5e346025fa65e27020503989eebe47e6;hp=9c99b2fb4e9df4e1e8a541fbdda8885fcb9b335f;hpb=93bbc2b0582d4199cef6642924dca7c95bfe135a;p=nihav.git diff --git a/nihav-duck/src/codecs/vpcommon.rs b/nihav-duck/src/codecs/vpcommon.rs index 9c99b2f..f41b89b 100644 --- a/nihav-duck/src/codecs/vpcommon.rs +++ b/nihav-duck/src/codecs/vpcommon.rs @@ -1,5 +1,6 @@ use nihav_core::codecs::*; -use nihav_core::codecs::blockdsp::*; +use nihav_codec_support::codecs::blockdsp; +use nihav_codec_support::codecs::blockdsp::*; pub const VP_YUVA420_FORMAT: NAPixelFormaton = NAPixelFormaton{ model: ColorModel::YUV(YUVSubmodel::YUVJ), @@ -197,7 +198,6 @@ pub fn rescale_prob(prob: u8, weights: &[i16; 2], maxval: i32) -> u8 { ((((prob as i32) * (weights[0] as i32) + 128) >> 8) + (weights[1] as i32)).min(maxval).max(1) as u8 } -#[macro_export] macro_rules! vp_tree { ($bc: expr, $prob: expr, $node1: expr, $node2: expr) => { if !$bc.read_prob($prob) {