X-Git-Url: https://git.nihav.org/?p=nihav.git;a=blobdiff_plain;f=nihav-core%2Fsrc%2Fscale%2Fscale.rs;h=fc97bd78e97230926f69255b034c60a597031c07;hp=b0415c99eb35274a52ccd8a98a708130b751b223;hb=b7c882c1ce6f86c07c2340751200e3a060942826;hpb=1ffd44c8a4064c0b57784e6791a95428692c1c41

diff --git a/nihav-core/src/scale/scale.rs b/nihav-core/src/scale/scale.rs
index b0415c9..fc97bd7 100644
--- a/nihav-core/src/scale/scale.rs
+++ b/nihav-core/src/scale/scale.rs
@@ -7,6 +7,7 @@ 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]);
@@ -41,6 +42,14 @@ fn scale_line<T:Copy>(src: &[T], dst: &mut [T], src_w: usize, dst_w: usize) {
     }
 }
 
+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();
@@ -61,6 +70,32 @@ macro_rules! scale_loop {
                     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);
+                }
+            }
     };
 }