X-Git-Url: https://git.nihav.org/?p=nihav.git;a=blobdiff_plain;f=nihav-realmedia%2Fsrc%2Fcodecs%2Frv60dsp.rs;h=062557b2895296203f83d22206f2230896571e2e;hp=be88a3e1b9fbfcf6d67f4f23783c500612b06957;hb=d649acc93b38f43bd7d7b36d7f89a44ad1493ad1;hpb=2eefcf7983adde9c24942ae6fe9a2ed2164bbca3 diff --git a/nihav-realmedia/src/codecs/rv60dsp.rs b/nihav-realmedia/src/codecs/rv60dsp.rs index be88a3e..062557b 100644 --- a/nihav-realmedia/src/codecs/rv60dsp.rs +++ b/nihav-realmedia/src/codecs/rv60dsp.rs @@ -154,7 +154,7 @@ macro_rules! diff{ ) } macro_rules! strength{ - ($el: expr, $lim: expr) => (if $el < $lim { 3 } else { 1 }) + ($el: expr, $lim: expr) => (if $el.abs() < $lim { 3 } else { 1 }) } fn clip_symm(val: i16, lim: i16) -> i16 { val.max(-lim).min(lim) } @@ -184,7 +184,7 @@ fn filter_luma_edge(dst: &mut [u8], mut offset: usize, step: usize, stride: usiz }; dst[offset - step] = clip8((dst[offset - step] as i16) + delta); dst[offset] = clip8((dst[offset] as i16) - delta); - if (str_q != 1) && (diff_q1q2.abs() <= (lim1 >> 2)) { + if (str_q != 1) && (diff_q1q2.abs() <= (lim2 >> 2)) { let diff = (diff_q1q0[y] + diff_q1q2 - delta) >> 1; let delta_q1 = if weak { clip_symm(diff, (mode1 >> 1) as i16) @@ -193,7 +193,7 @@ fn filter_luma_edge(dst: &mut [u8], mut offset: usize, step: usize, stride: usiz }; dst[offset - 2 * step] = clip8((dst[offset - 2 * step] as i16) - delta_q1); } - if (str_p != 1) && (diff_p1p2.abs() <= (lim1 >> 2)) { + if (str_p != 1) && (diff_p1p2.abs() <= (lim2 >> 2)) { let diff = (diff_p1p0[y] + diff_p1p2 + delta) >> 1; let delta_p1 = if weak { clip_symm(diff, (mode2 >> 1) as i16)