X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-core%2Fsrc%2Fscale%2Fscale.rs;h=b0415c99eb35274a52ccd8a98a708130b751b223;hb=4997179df78d982965603a1835c52df1f14eb5ef;hp=197b7c4a6937e6f7adb57fda324b82a270323419;hpb=03accf760cf79bc56d7c6dc6e82cd885fb7e1e13;p=nihav.git

diff --git a/nihav-core/src/scale/scale.rs b/nihav-core/src/scale/scale.rs
index 197b7c4..b0415c9 100644
--- a/nihav-core/src/scale/scale.rs
+++ b/nihav-core/src/scale/scale.rs
@@ -7,6 +7,40 @@ impl NNResampler {
     fn new() -> Self { Self{} }
 }
 
+fn scale_line<T:Copy>(src: &[T], dst: &mut [T], src_w: usize, dst_w: usize) {
+    if src_w == dst_w {
+        (&mut dst[..dst_w]).copy_from_slice(&src[..dst_w]);
+    } else if src_w < dst_w {
+        if dst_w % src_w == 0 {
+            let step = dst_w / src_w;
+            for (out, srcv) in dst.chunks_exact_mut(step).take(src_w).zip(src.iter()) {
+                for el in out.iter_mut() {
+                    *el = *srcv;
+                }
+            }
+        } else {
+            let mut pos = 0;
+            for out in dst.iter_mut().take(dst_w) {
+                *out = src[pos / dst_w];
+                pos += src_w;
+            }
+        }
+    } else {
+        if dst_w % src_w == 0 {
+            let step = src_w / dst_w;
+            for (out, srcv) in dst.iter_mut().take(dst_w).zip(src.iter().step_by(step)) {
+                *out = *srcv;
+            }
+        } else {
+            let mut pos = 0;
+            for out in dst.iter_mut().take(dst_w) {
+                *out = src[pos / dst_w];
+                pos += src_w;
+            }
+        }
+    }
+}
+
 macro_rules! scale_loop {
     ($sbuf:expr, $dbuf:expr) => {
             let fmt = $sbuf.get_info().get_format();
@@ -23,10 +57,7 @@ macro_rules! scale_loop {
                 for y in 0..dh {
                     let sy = y * sh / dh;
                     let soff = ioff + sy * istride;
-                    for x in 0..dw {
-                        let sx = x * sw / dw;
-                        dst[doff + x] = src[soff + sx];
-                    }
+                    scale_line(&src[soff..], &mut dst[doff..], sw, dw);
                     doff += dstride;
                 }
             }
@@ -52,7 +83,7 @@ impl Kernel for NNResampler {
     }
 }
 
-pub fn create_scale() -> Box<Kernel> {
+pub fn create_scale() -> Box<dyn Kernel> {
     Box::new(NNResampler::new())
 }