X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-core%2Fsrc%2Fscale%2Fscale.rs;h=a0bd0cab078f9dab6d2793d45856bdee0f360bb0;hb=25e0bf9a974b1bb5a8f8b38e23b4a7e91db3eab0;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..a0bd0ca 100644
--- a/nihav-core/src/scale/scale.rs
+++ b/nihav-core/src/scale/scale.rs
@@ -7,6 +7,49 @@ impl NNResampler {
     fn new() -> Self { Self{} }
 }
 
+#[allow(clippy::comparison_chain)]
+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;
+            }
+        }
+    }
+}
+
+fn fill_plane<T: Copy>(dst: &mut [T], w: usize, h: usize, stride: usize, val: T) {
+    for row in dst.chunks_mut(stride).take(h) {
+        for el in row.iter_mut().take(w) {
+            *el = val;
+        }
+    }
+}
+
 macro_rules! scale_loop {
     ($sbuf:expr, $dbuf:expr) => {
             let fmt = $sbuf.get_info().get_format();
@@ -23,18 +66,41 @@ 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;
                 }
             }
+            let dfmt = $dbuf.get_info().get_format();
+            let ndcomp = dfmt.get_num_comp();
+            if ndcomp > ncomp {
+                if !fmt.alpha && dfmt.alpha {
+                    let acomp = ndcomp - 1;
+                    let dstride = $dbuf.get_stride(acomp);
+                    let (dw, dh) = $dbuf.get_dimensions(acomp);
+                    let doff = $dbuf.get_offset(acomp);
+                    let dst = $dbuf.get_data_mut().unwrap();
+                    fill_plane(&mut dst[doff..], dw, dh, dstride, 0);
+                }
+                if fmt.model.is_yuv() && ((!fmt.alpha && ncomp == 1) || (fmt.alpha && ncomp == 2)) && ndcomp >= 3 {
+                    let uval = 1 << (dfmt.comp_info[1].unwrap().depth - 1);
+                    let vval = 1 << (dfmt.comp_info[2].unwrap().depth - 1);
+
+                    let ustride = $dbuf.get_stride(1);
+                    let vstride = $dbuf.get_stride(2);
+                    let (uw, uh) = $dbuf.get_dimensions(1);
+                    let (vw, vh) = $dbuf.get_dimensions(2);
+                    let uoff = $dbuf.get_offset(1);
+                    let voff = $dbuf.get_offset(2);
+                    let dst = $dbuf.get_data_mut().unwrap();
+                    fill_plane(&mut dst[uoff..], uw, uh, ustride, uval);
+                    fill_plane(&mut dst[voff..], vw, vh, vstride, vval);
+                }
+            }
     };
 }
 
 impl Kernel for NNResampler {
-    fn init(&mut self, in_fmt: &ScaleInfo, dest_fmt: &ScaleInfo) -> ScaleResult<NABufferType> {
+    fn init(&mut self, in_fmt: &ScaleInfo, dest_fmt: &ScaleInfo, _options: &[(String, String)]) -> ScaleResult<NABufferType> {
         let res = alloc_video_buffer(NAVideoInfo::new(dest_fmt.width, dest_fmt.height, false, in_fmt.fmt), 3);
         if res.is_err() { return Err(ScaleError::AllocError); }
         Ok(res.unwrap())
@@ -52,7 +118,7 @@ impl Kernel for NNResampler {
     }
 }
 
-pub fn create_scale() -> Box<Kernel> {
+pub fn create_scale() -> Box<dyn Kernel> {
     Box::new(NNResampler::new())
 }