fn BitDepth::pxstride: Implement generically over BitDepths.

memorysafety · Feb 28, 2024 · 8105376 · 8105376
1 parent 82062a9
commit 8105376
Showing 1 changed file with 5 additions and 10 deletions.
diff --git a/include/common/bitdepth.rs b/include/common/bitdepth.rs
@@ -174,7 +174,11 @@ pub trait BitDepth: Clone + Copy {
         clip(pixel, 0.into(), self.bitdepth_max())
     }
 
-    fn pxstride(n: usize) -> usize;
+    fn pxstride(n: usize) -> usize {
+        let scale = mem::size_of::<Self::Pixel>();
+        debug_assert!(n % scale == 0);
+        n / scale
+    }
 
     fn bitdepth(&self) -> u8;
 
@@ -238,10 +242,6 @@ impl BitDepth for BitDepth8 {
         DisplayPixel8(pixel)
     }
 
-    fn pxstride(n: usize) -> usize {
-        n
-    }
-
     fn bitdepth(&self) -> u8 {
         Self::BITDEPTH
     }
@@ -319,11 +319,6 @@ impl BitDepth for BitDepth16 {
         DisplayPixel16(pixel)
     }
 
-    fn pxstride(n: usize) -> usize {
-        debug_assert!(n & 1 == 0);
-        n >> 1
-    }
-
     fn bitdepth(&self) -> u8 {
         (Self::Pixel::BITS - self.bitdepth_max.leading_zeros()) as u8
     }