From 2167abcf72d978b4ac2f08fa7cbbddaada01f165 Mon Sep 17 00:00:00 2001
From: metamuffin <metamuffin@disroot.org>
Date: Tue, 7 Mar 2023 08:00:00 +0100
Subject: a

---
 evc/src/bin/decode.rs |  7 +------
 evc/src/bin/encode.rs | 17 ++++-------------
 2 files changed, 5 insertions(+), 19 deletions(-)

(limited to 'evc/src/bin')

diff --git a/evc/src/bin/decode.rs b/evc/src/bin/decode.rs
index 4ac4fc8..fbf5624 100644
--- a/evc/src/bin/decode.rs
+++ b/evc/src/bin/decode.rs
@@ -17,9 +17,6 @@ use std::io::{BufReader, BufWriter};
 pub struct DecodeArgs {
     #[arg(long)]
     debug: bool,
-
-    #[arg(short, long, default_value = "8")]
-    jobs: usize,
 }
 
 fn main() -> anyhow::Result<()> {
@@ -36,9 +33,7 @@ fn main() -> anyhow::Result<()> {
     }
     let size = header.resolution;
 
-    let config = DecodeConfig {
-        max_threads: args.jobs,
-    };
+    let config = DecodeConfig {};
 
     let progress_bar = ProgressBar::new(header.frame_count as u64);
 
diff --git a/evc/src/bin/encode.rs b/evc/src/bin/encode.rs
index e1f6730..6d18992 100644
--- a/evc/src/bin/encode.rs
+++ b/evc/src/bin/encode.rs
@@ -3,6 +3,7 @@ use clap::Parser;
 use indicatif::ProgressBar;
 use libreschmux::{
     codec::{
+        compress::compress_block,
         decode::{decode_block, DecodeConfig},
         encode::{encode_block, EncodeConfig, EncodeMode},
     },
@@ -11,6 +12,7 @@ use libreschmux::{
     helpers::vector::Vec2,
 };
 use log::info;
+use rayon::{ThreadPool, ThreadPoolBuilder};
 use std::io::{BufReader, BufWriter};
 
 #[derive(Parser)]
@@ -34,9 +36,6 @@ pub struct EncodeArgs {
     #[arg[short = 'L', long]]
     length: Option<usize>,
 
-    #[arg(short, long, default_value = "8")]
-    jobs: usize,
-
     #[arg(short, long, default_value = "8")]
     min_block_size: isize,
 
@@ -57,7 +56,6 @@ fn main() -> anyhow::Result<()> {
         weight_factor: 50.0,
         max_diff_area: 10_000,
         min_block_size: args.min_block_size,
-        max_threads: args.jobs,
         do_translate: !args.no_translate,
         do_linear_transform: !args.no_linear_transform,
         do_value_scale: !args.no_value_scale,
@@ -75,8 +73,8 @@ fn main() -> anyhow::Result<()> {
         .context("writing header")?;
 
     let progress_bar = args.length.map(|len| ProgressBar::new(len as u64));
-
     let mut prev_frame = Frame::new(size);
+
     for i in 0.. {
         info!("encode frame {i}");
         let mut frame = Frame::read(&mut input, size).context("reading raw frame")?;
@@ -106,14 +104,7 @@ fn main() -> anyhow::Result<()> {
             progress_bar.inc(1);
         }
 
-        decode_block(
-            &root,
-            frame.view_mut(),
-            prev_frame.view(),
-            &DecodeConfig {
-                max_threads: config.max_threads,
-            },
-        );
+        decode_block(&root, frame.view_mut(), prev_frame.view(), &DecodeConfig {});
 
         prev_frame = frame;
     }
-- 
cgit v1.2.3-70-g09d2