X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-realmedia%2Fsrc%2Fcodecs%2Frv40dsp.rs;h=2300941c8317b7a9645c377c6d70aa6c3d87fb8a;hb=817e487223b28379176a533f09485c27a68443f8;hp=299c39505b1dc78106e2d7adab74e5d648b1de53;hpb=fa57381ec2a3b8c441aa1388492b9ca037cfcf78;p=nihav.git diff --git a/nihav-realmedia/src/codecs/rv40dsp.rs b/nihav-realmedia/src/codecs/rv40dsp.rs index 299c395..2300941 100644 --- a/nihav-realmedia/src/codecs/rv40dsp.rs +++ b/nihav-realmedia/src/codecs/rv40dsp.rs @@ -285,14 +285,14 @@ fn rv40_weak_loop_filter4(pix: &mut [u8], mut off: usize, step: usize, stride: u let q1 = el!(pix, off + step); let q2 = el!(pix, off + 2*step); - let str; + let strength; if filter_p1 && filter_q1 { - str = (t << 2) + (p1 - q1); + strength = (t << 2) + (p1 - q1); } else { - str = t << 2; + strength = t << 2; } - let diff = clip_symm((str + 4) >> 3, lim_p0q0); + let diff = clip_symm((strength + 4) >> 3, lim_p0q0); pix[off - step] = clip8(p0 + diff); pix[off ] = clip8(q0 - diff); @@ -340,14 +340,14 @@ fn rv40_weak_loop_filter4_v(pix: &mut [u8], off: usize, stride: usize, let q1 = el!(ch, 3 + 1); let q2 = el!(ch, 3 + 2); - let str; + let strength; if filter_p1 && filter_q1 { - str = (t << 2) + (p1 - q1); + strength = (t << 2) + (p1 - q1); } else { - str = t << 2; + strength = t << 2; } - let diff = clip_symm((str + 4) >> 3, lim_p0q0); + let diff = clip_symm((strength + 4) >> 3, lim_p0q0); ch[3 - 1] = clip8(p0 + diff); ch[3 ] = clip8(q0 - diff); @@ -591,7 +591,7 @@ const C_LEFT_COL_MASK: u32 = 0x5; const C_RIGHT_COL_MASK: u32 = 0xA; impl RV34DSP for RV40DSP { - #[allow(clippy::cyclomatic_complexity)] + #[allow(clippy::cognitive_complexity)] fn loop_filter(&self, frame: &mut NAVideoBuffer, _ftype: FrameType, mbinfo: &[RV34MBInfo], mb_w: usize, mb_h: usize, row: usize) { // todo proper B-frame filtering? let mut offs: [usize; 3] = [0; 3];