unsafe multithreading

6 files changed, 66 insertions, 8 deletions

diff --git a/evc/src/bin/decode.rs b/evc/src/bin/decode.rs
index f2f4c65..b15467f 100644
--- a/evc/src/bin/decode.rs
+++ b/evc/src/bin/decode.rs
@@ -62,7 +62,7 @@ fn draw_debug(block: &Block, mut target: View<&mut Frame>) {
             target.draw_box(Pixel::BLUE);
             target
                 .frame
-                .draw_line(target.center(), target.center() + *translation, Pixel::BLUE)
+                .draw_line(target.center(), target.center() + *translation, Pixel::RED)
         }
     }
 }
diff --git a/evc/src/bin/encode.rs b/evc/src/bin/encode.rs
index 79ec934..fb5a18b 100644
--- a/evc/src/bin/encode.rs
+++ b/evc/src/bin/encode.rs
@@ -36,7 +36,7 @@ fn main() -> anyhow::Result<()> {
 
     let config = EncodeConfig {
         translate: !args.no_translation,
-        ref_thres: args.ref_thres,
+        ref_thres: 2.0,
         max_diff_size: 10_000,
         min_block_size: 12,
     };
diff --git a/evc/src/codec/encode.rs b/evc/src/codec/encode.rs
index 7322fea..13df17d 100644
--- a/evc/src/codec/encode.rs
+++ b/evc/src/codec/encode.rs
@@ -1,4 +1,6 @@
-use crate::{block::Block, frame::Frame, vec2::Vec2, view::View};
+use crate::{
+    block::Block, frame::Frame, pixel::Pixel, threading::both_par, vec2::Vec2, view::View,
+};
 
 #[derive(Debug, Clone)]
 pub struct EncodeConfig {
@@ -6,9 +8,13 @@ pub struct EncodeConfig {
     pub ref_thres: f64,
     pub max_diff_size: isize,
     pub min_block_size: isize,
+    // pub importance_k: f64,
+    // pub importance_scale: f64,
 }
 
 pub fn encode_block(view: View<&Frame>, prev: View<&Frame>, config: &EncodeConfig) -> Block {
+    // let importance = importance(&view);
+
     let (diff, translation) = if view.area() > config.max_diff_size {
         (f64::INFINITY, Vec2::ZERO)
     } else if config.translate {
@@ -29,16 +35,23 @@ pub fn encode_block(view: View<&Frame>, prev: View<&Frame>, config: &EncodeConfi
     } else {
         (View::diff(&view, &prev) / view.area() as f64, Vec2::ZERO)
     };
-    if diff < config.ref_thres {
+    // config.importance_k)
+    // / (config.importance_k + importance * config.importance_scale)
+    if diff < (config.ref_thres) {
         Block::Reference { translation }
     } else {
         if view.size.x < config.min_block_size {
             Block::Literal(view.pixels())
         } else {
-            let [av, bv] = view.split();
-            let [ap, bp] = prev.split();
-            let a = encode_block(av, ap, config);
-            let b = encode_block(bv, bp, config);
+            let [av, bv] =
+                unsafe { std::mem::transmute::<_, [View<&'static Frame>; 2]>(view.split()) };
+            let [ap, bp] =
+                unsafe { std::mem::transmute::<_, [View<&'static Frame>; 2]>(prev.split()) };
+            let config = unsafe { std::mem::transmute::<_, &'static EncodeConfig>(config) };
+            let (a, b) = both_par(
+                || encode_block(av, ap, config),
+                || encode_block(bv, bp, config),
+            );
             if a.is_literal() && b.is_literal() {
                 Block::Literal(view.pixels())
             } else {
@@ -47,3 +60,19 @@ pub fn encode_block(view: View<&Frame>, prev: View<&Frame>, config: &EncodeConfi
         }
     }
 }
+
+pub fn importance(view: &View<&Frame>) -> f64 {
+    let mut acc = 0;
+    for x in 0..view.size.x {
+        for y in 0..view.size.y {
+            let p = Vec2 { x, y };
+            if x > 0 {
+                acc += Pixel::distance(view[p], view[p + Vec2::LEFT]);
+            }
+            if y > 0 {
+                acc += Pixel::distance(view[p], view[p + Vec2::UP]);
+            }
+        }
+    }
+    (acc / view.area() as usize) as f64
+}
diff --git a/evc/src/lib.rs b/evc/src/lib.rs
index 22866e1..e8eb51d 100644
--- a/evc/src/lib.rs
+++ b/evc/src/lib.rs
@@ -12,3 +12,4 @@ pub mod pixel;
 pub mod ser;
 pub mod view;
 pub mod vec2;
+pub mod threading;
diff --git a/evc/src/threading.rs b/evc/src/threading.rs
new file mode 100644
index 0000000..012b5bf
--- /dev/null
+++ b/evc/src/threading.rs
@@ -0,0 +1,26 @@
+use std::{
+    sync::atomic::{AtomicUsize, Ordering},
+    thread,
+};
+
+static THREADS_RUNNING: AtomicUsize = AtomicUsize::new(0);
+
+pub fn both_par<F1, F2, O1, O2>(f1: F1, f2: F2) -> (O1, O2)
+where
+    F1: FnOnce() -> O1 + Send + 'static,
+    O1: Send + 'static,
+    F2: FnOnce() -> O2,
+{
+    if THREADS_RUNNING.load(Ordering::Relaxed) < 12 {
+        THREADS_RUNNING.fetch_add(1, Ordering::Relaxed);
+
+        let o1h = thread::spawn(move || f1());
+        let o2 = f2();
+        let o1 = o1h.join().unwrap();
+
+        THREADS_RUNNING.fetch_sub(1, Ordering::Relaxed);
+        (o1, o2)
+    } else {
+        (f1(), f2())
+    }
+}
diff --git a/evc/src/vec2.rs b/evc/src/vec2.rs
index 8b01fdb..5713d02 100644
--- a/evc/src/vec2.rs
+++ b/evc/src/vec2.rs
@@ -7,6 +7,8 @@ pub struct Vec2 {
 }
 impl Vec2 {
     pub const ZERO: Vec2 = Vec2 { x: 0, y: 0 };
+    pub const UP: Vec2 = Vec2 { x: 0, y: -1 };
+    pub const LEFT: Vec2 = Vec2 { x: -1, y: 0 };
     pub fn downscale(&self, f: isize) -> Self {
         Self {
             x: self.x / f,