X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-duck%2Fsrc%2Fcodecs%2Fvp78dsp.rs;h=9d68616aac029da7d28b581ee234593de1d10b1b;hb=e6aaad5c5273cd814b5748b7faf3751835a37217;hp=04545bd40754b64c6cdd26e3f6353c04294a02a8;hpb=0cc75664f579f511681ee7000741484a1d849061;p=nihav.git diff --git a/nihav-duck/src/codecs/vp78dsp.rs b/nihav-duck/src/codecs/vp78dsp.rs index 04545bd..9d68616 100644 --- a/nihav-duck/src/codecs/vp78dsp.rs +++ b/nihav-duck/src/codecs/vp78dsp.rs @@ -129,6 +129,13 @@ pub trait IntraPred { off += stride; } } + fn ipred_const(dst: &mut [u8], off: usize, stride: usize, dc: u8) { + for row in dst[off..].chunks_mut(stride).take(Self::SIZE) { + for el in row[..Self::SIZE].iter_mut() { + *el = dc; + } + } + } } pub struct IPred16x16 {} @@ -223,7 +230,6 @@ macro_rules! load_pred4 { pub struct IPred4x4 {} impl IPred4x4 { pub fn ipred_dc(dst: &mut [u8], mut off: usize, stride: usize, ipred: &IPredContext) { - let dc; let mut dcsum = 0; for el in ipred.left.iter().take(4) { dcsum += u16::from(*el); @@ -231,7 +237,7 @@ impl IPred4x4 { for el in ipred.top.iter().take(4) { dcsum += u16::from(*el); } - dc = ((dcsum + (1 << 2)) >> 3) as u8; + let dc = ((dcsum + (1 << 2)) >> 3) as u8; for _ in 0..4 { let out = &mut dst[off..][..4]; for el in out.iter_mut() { @@ -390,7 +396,7 @@ fn mc_block_common(dst: &mut [u8], mut doff: usize, dstride: usize, src: &[u8], let dst = &mut dst[doff..]; let src = &src[EDGE_PRE + EDGE_PRE * sstride..]; for (out, src) in dst.chunks_mut(dstride).take(size).zip(src.chunks(sstride)) { - (&mut out[0..size]).copy_from_slice(&src[0..size]); + out[..size].copy_from_slice(&src[..size]); } } else if my == 0 { let src = &src[EDGE_PRE * sstride..]; @@ -433,7 +439,7 @@ fn mc_block(dst: &mut [u8], doff: usize, dstride: usize, xpos: usize, ypos: usiz let src = &reffrm.get_data(); let src = &src[srcoff..]; for (out, src) in dst.chunks_mut(dstride).take(size).zip(src.chunks(sstride)) { - (&mut out[0..size]).copy_from_slice(&src[0..size]); + out[..size].copy_from_slice(&src[..size]); } return; } @@ -506,7 +512,7 @@ pub fn mc_block_special(dst: &mut [u8], doff: usize, dstride: usize, xpos: usize (&data[off + (start_x as usize) + (start_y as usize) * stride..], ((stride as isize) + xstep) as usize) } else { - let add = (size + EDGE_PRE + EDGE_POST) * (xstep.abs() as usize); + let add = (size + EDGE_PRE + EDGE_POST) * xstep.unsigned_abs(); let bw = size + EDGE_PRE + EDGE_POST + add; let bh = (end_y - start_y) as usize; let bo = if xstep >= 0 { 0 } else { add };