fix or silence clippy warnings

[nihav.git] / nihav-itu / src / codecs / h264 / dsp.rs

diff --git a/nihav-itu/src/codecs/h264/dsp.rs b/nihav-itu/src/codecs/h264/dsp.rs
index 0b3c1e17a23c4cdbff054f1128c566588c5e8702..87dc8d9fd97b301003d89fe52488eb71d0192f2c 100644 (file)
--- a/nihav-itu/src/codecs/h264/dsp.rs
+++ b/nihav-itu/src/codecs/h264/dsp.rs
@@ -46,12 +46,12 @@ pub fn chroma_dc_transform(blk: &mut [i16; 4], qp: u8) {
     blk[2] = t1 + t3;
     blk[3] = t1 - t3;
     if qp < 6 {
-        let mul = i16::from(LEVEL_SCALE[0][qp as usize]);
+        let mul = LEVEL_SCALE[0][qp as usize];
         for el in blk.iter_mut() {
             *el = el.wrapping_mul(mul) >> 1;
         }
     } else {
-        let mul = i16::from(LEVEL_SCALE[0][(qp % 6) as usize]);
+        let mul = LEVEL_SCALE[0][(qp % 6) as usize];
         let shift = qp / 6 - 1;
         for el in blk.iter_mut() {
             *el = el.wrapping_mul(mul) << shift;
@@ -113,14 +113,14 @@ macro_rules! transform {
 
 pub fn idct_luma_dc(blk: &mut [i16; 16], qp: u8) {
     if qp < 12 {
-        let mul = i16::from(LEVEL_SCALE[0][(qp % 6) as usize]);
+        let mul = LEVEL_SCALE[0][(qp % 6) as usize];
         let shift = 2 - qp / 6;
         let bias = 1 << shift >> 1;
         for el in blk.iter_mut() {
             *el = el.wrapping_mul(mul).wrapping_add(bias) >> shift;
         }
     } else {
-        let mul = i16::from(LEVEL_SCALE[0][(qp % 6) as usize]);
+        let mul = LEVEL_SCALE[0][(qp % 6) as usize];
         let shift = qp / 6 - 2;
         for el in blk.iter_mut() {
             *el = el.wrapping_mul(mul) << shift;
@@ -1097,13 +1097,33 @@ fn chroma_interp(dst: &mut [u8], dstride: usize, src: &[u8], sstride: usize, dx:
     let b1 = dy;
 
     let src1 = &src[sstride..];
-    for (drow, (line0, line1)) in dst.chunks_mut(dstride).zip(src.chunks(sstride).zip(src1.chunks(sstride))).take(h) {
-        let mut a = line0[0];
-        let mut c = line1[0];
-        for (pix, (&b, &d)) in drow.iter_mut().take(w).zip(line0[1..].iter().zip(line1[1..].iter())) {
-            *pix = ((u16::from(a) * a0 * b0 + u16::from(b) * a1 * b0 + u16::from(c) * a0 * b1 + u16::from(d) * a1 * b1 + 0x20) >> 6) as u8;
-            a = b;
-            c = d;
+    if a0 == 8 && b0 == 8 {
+        for (drow, line) in dst.chunks_mut(dstride).zip(src.chunks(sstride)).take(h) {
+            drow[..w].copy_from_slice(&line[..w]);
+        }
+    } else if a0 == 8 {
+        for (drow, (line0, line1)) in dst.chunks_mut(dstride).zip(src.chunks(sstride).zip(src1.chunks(sstride))).take(h) {
+            for (pix, (&a, &b)) in drow.iter_mut().take(w).zip(line0.iter().zip(line1.iter())) {
+                *pix = ((u16::from(a) * b0 + u16::from(b) * b1 + 4) >> 3) as u8;
+            }
+        }
+    } else if b0 == 8 {
+        for (drow, line) in dst.chunks_mut(dstride).zip(src.chunks(sstride)).take(h) {
+            let mut a = line[0];
+            for (pix, &b) in drow.iter_mut().take(w).zip(line.iter().skip(1)) {
+                *pix = ((u16::from(a) * a0 + u16::from(b) * a1 + 4) >> 3) as u8;
+                a = b;
+            }
+        }
+    } else {
+        for (drow, (line0, line1)) in dst.chunks_mut(dstride).zip(src.chunks(sstride).zip(src1.chunks(sstride))).take(h) {
+            let mut a = line0[0];
+            let mut c = line1[0];
+            for (pix, (&b, &d)) in drow.iter_mut().take(w).zip(line0[1..].iter().zip(line1[1..].iter())) {
+                *pix = ((u16::from(a) * a0 * b0 + u16::from(b) * a1 * b0 + u16::from(c) * a0 * b1 + u16::from(d) * a1 * b1 + 0x20) >> 6) as u8;
+                a = b;
+                c = d;
+            }
         }
     }
 }