X-Git-Url: https://git.nihav.org/?p=nihav.git;a=blobdiff_plain;f=nihav-duck%2Fsrc%2Fcodecs%2Fvp7enc%2Fframe_coder.rs;fp=nihav-duck%2Fsrc%2Fcodecs%2Fvp7enc%2Fframe_coder.rs;h=b9ba73edaf8208eefc0c2aed4e33eb26a1131c46;hp=336eb06d49524730dcdfa921a4642de1d9215ac8;hb=9a110b6c529ceaeba58b3e7dd8f4c902df6a2083;hpb=3b48bf68e6df822ec0540cd905d528d82e2209e1 diff --git a/nihav-duck/src/codecs/vp7enc/frame_coder.rs b/nihav-duck/src/codecs/vp7enc/frame_coder.rs index 336eb06..b9ba73e 100644 --- a/nihav-duck/src/codecs/vp7enc/frame_coder.rs +++ b/nihav-duck/src/codecs/vp7enc/frame_coder.rs @@ -2,6 +2,7 @@ use nihav_core::codecs::*; use nihav_codec_support::codecs::ZERO_MV; use super::super::vp78::PredMode; use super::super::vp78dsp::*; +use super::super::vp7data::HIGH_EDGE_VAR_THR; use super::super::vp7dsp::*; use super::blocks::*; use super::coder::*; @@ -544,19 +545,6 @@ impl FrameEncoder { } fn loop_filter_mb(dframe: &mut NASimpleVideoFrame, mb_x: usize, mb_y: usize, loop_str: u8, loop_params: &LoopParams, is_intra: bool) { - const HIGH_EDGE_VAR_THR: [[u8; 64]; 2] = [ - [ - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, - 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3 - ], [ - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2 - ]]; - let edge_thr = i16::from(loop_str) + 2; let luma_thr = i16::from(loop_str); let chroma_thr = i16::from(loop_str) * 2;