core/scale: process only common components in packing/unpacking

[nihav.git] / nihav-core / src / scale / repack.rs

diff --git a/nihav-core/src/scale/repack.rs b/nihav-core/src/scale/repack.rs
index faa5fe72dc58270376c943d5c455087f44b03817..23ba2c93cb56801b562aeac71af5e55439f19d7d 100644 (file)
--- a/nihav-core/src/scale/repack.rs
+++ b/nihav-core/src/scale/repack.rs
@@ -34,7 +34,7 @@ impl PackKernel {
 
 impl Kernel for PackKernel {
     fn init(&mut self, in_fmt: &ScaleInfo, dest_fmt: &ScaleInfo) -> ScaleResult<NABufferType> {
-        self.ncomps = in_fmt.fmt.components as usize;
+        self.ncomps = in_fmt.fmt.components.min(dest_fmt.fmt.components) as usize;
         for i in 0..self.ncomps {
             let ichr = in_fmt.fmt.comp_info[i].unwrap();
             let ochr = dest_fmt.fmt.comp_info[i].unwrap();
@@ -121,7 +121,7 @@ impl UnpackKernel {
 
 impl Kernel for UnpackKernel {
     fn init(&mut self, in_fmt: &ScaleInfo, dest_fmt: &ScaleInfo) -> ScaleResult<NABufferType> {
-        self.ncomps = in_fmt.fmt.components as usize;
+        self.ncomps = in_fmt.fmt.components.min(dest_fmt.fmt.components) as usize;
         let mut chr: Vec<Option<NAPixelChromaton>> = Vec::with_capacity(MAX_CHROMATONS);
         for i in 0..self.ncomps {
             let ichr = in_fmt.fmt.comp_info[i].unwrap();
@@ -143,9 +143,8 @@ impl Kernel for UnpackKernel {
             chr.push(Some(dchr));
         }
         let mut df = in_fmt.fmt;
-        for i in 0..self.ncomps {
-            df.comp_info[i] = chr[i];
-        }
+        df.comp_info[..self.ncomps].clone_from_slice(&chr[..self.ncomps]);
+        df.components = self.ncomps as u8;
         df.palette = false;
 println!(" [intermediate format {}]", df);
         let res = alloc_video_buffer(NAVideoInfo::new(in_fmt.width, in_fmt.height, false, df), 3);
@@ -253,9 +252,7 @@ impl Kernel for DepalKernel {
         }
         let mut df = in_fmt.fmt;
         df.palette = false;
-        for i in 0..self.ncomps {
-            df.comp_info[i] = chr[i];
-        }
+        df.comp_info[..self.ncomps].clone_from_slice(&chr[..self.ncomps]);
 println!(" [intermediate format {}]", df);
         let res = alloc_video_buffer(NAVideoInfo::new(in_fmt.width, in_fmt.height, false, df), 3);
         if res.is_err() { return Err(ScaleError::AllocError); }