works

1 files changed, 45 insertions, 41 deletions

diff --git a/lvc/src/diff.rs b/lvc/src/diff.rs
index 5c65c29..354f146 100644
--- a/lvc/src/diff.rs
+++ b/lvc/src/diff.rs
@@ -1,13 +1,13 @@
 use crate::{Frame, Ref, View, P2};
-use std::simd::{i32x16, SimdInt};
 
 // 4ms
 pub fn diff([frame1, frame2]: [&Frame; 2], view: View, rp: Ref) -> u32 {
     let mut k = 0;
     for y in view.a.y..view.b.y {
         for x in view.a.x..view.b.x {
-            let p1 = frame1[P2 { x, y }] + rp.color_off;
-            let p2 = frame2[P2 { x, y }];
+            let pos = P2 { x, y };
+            let p1 = frame1[pos + rp.pos_off] + rp.color_off;
+            let p2 = frame2[pos];
             k += p1.r.abs_diff(p2.r) as u32
                 + p1.g.abs_diff(p2.g) as u32
                 + p1.b.abs_diff(p2.b) as u32;
@@ -16,53 +16,57 @@ pub fn diff([frame1, frame2]: [&Frame; 2], view: View, rp: Ref) -> u32 {
     k
 }
 
-pub fn fast_diff([frame1, frame2]: [&Frame; 2], view: View, rp: Ref) -> u32 {
-    let mut k = 0;
+// pub fn fast_diff([frame1, frame2]: [&Frame; 2], view: View, rp: Ref) -> u32 {
+//     assert!(view.size().x % 5 == 0);
 
-    let mut diff_lanes = i32x16::from_array([0; 16]);
-    let mut k1 = [0; 16];
-    let mut k2 = [0; 16];
+//     let mut diff_lanes = i32x16::from_array([0; 16]);
+//     let mut k1 = [0; 32];
+//     let mut k2 = [0; 32];
 
-    let next_line = frame1.size.x as usize - view.size().x as usize;
-    let index_start = view.a.x as usize + view.a.y as usize * frame1.size.x as usize;
-    let index_end = view.b.x as usize + (view.b.y as usize - 1) * frame1.size.x as usize;
+//     let next_line = frame1.size.x as usize - view.size().x as usize;
+//     let index_start = view.a.x as usize + view.a.y as usize * frame1.size.x as usize;
+//     let index_end = view.b.x as usize + (view.b.y as usize - 1) * frame1.size.x as usize;
 
-    let mut i = index_start;
-    let mut x = view.a.x;
-    let mut kfill = 0;
+//     let mut i = index_start;
+//     let mut x = view.a.x;
 
-    while i < index_end {
-        k1[kfill] = frame1.pixels[i].r as i32;
-        k2[kfill] = frame2.pixels[i].r as i32;
-        kfill += 1;
-        k1[kfill] = frame1.pixels[i].g as i32;
-        k2[kfill] = frame2.pixels[i].g as i32;
-        kfill += 1;
-        k1[kfill] = frame1.pixels[i].b as i32;
-        k2[kfill] = frame2.pixels[i].b as i32;
-        kfill += 1;
+//     while i < index_end {
 
-        i += 1;
-        x += 1;
-        if x > view.b.x {
-            i += next_line;
-            x = view.a.x
-        }
+//         let f1: &[u8] =
+//             unsafe { std::slice::from_raw_parts(frame1.pixels[sl_start..].as_ptr() as *mut u8, sl_size) };
+//         let f2: &[u8] =
+//             unsafe { std::slice::from_raw_parts(frame2.pixels[sl_start..].as_ptr() as *mut u8, sl_size) };
 
-        if kfill == 15 {
-            let pl1 = i32x16::from_array(k1);
-            let pl2 = i32x16::from_array(k2);
-            diff_lanes += (pl1 - pl2).abs();
-            kfill = 0;
-        }
-    }
+//         for i in 0..15 {
+//             k1[i] = f1[i] as i32;
+//             k2[i] = f2[i] as i32;
+//         }
 
-    return diff_lanes.reduce_sum() as u32;
-}
+//         // for j in 0..5 {
+//         //     let j3 = j * 3;
+//         //     k1[j3] = frame1.pixels[i + j].r as i32;
+//         //     k2[j3] = frame2.pixels[i + j].r as i32;
+//         //     k1[j3 + 1] = frame1.pixels[i + j].g as i32;
+//         //     k2[j3 + 1] = frame2.pixels[i + j].g as i32;
+//         //     k1[j3 + 2] = frame1.pixels[i + j].b as i32;
+//         //     k2[j3 + 2] = frame2.pixels[i + j].b as i32;
+//         // }
+//         let pl1 = i16x32::from_array(k1);
+//         let pl2 = i16x32::from_array(k2);
+//         diff_lanes += (pl1 - pl2).abs();
 
-// pub fn fast_diff([frame1, frame2]: [&Frame; 2], view: View, rp: Ref) -> u32 {
-//     let mut k = 0;
+//         i += 5;
+//         x += 5;
+//         if x > view.b.x {
+//             i += next_line;
+//             x = view.a.x
+//         }
+//     }
+
+//     return diff_lanes.reduce_sum() as u32;
+// }
 
+// pub fn fast_diff([frame1, frame2]: [&Frame; 2], view: View, rp: Ref) -> u32 {
 //     let mut diff_lanes = i32x16::from_array([0; 16]);
 //     let mut k1 = [0; 16];
 //     let mut k2 = [0; 16];