test2

3 files changed, 24 insertions, 18 deletions

diff --git a/mtree-test/src/bin/decode.rs b/mtree-test/src/decode.rs
index 992bebc..9c29717 100644
--- a/mtree-test/src/bin/decode.rs
+++ b/mtree-test/src/decode.rs
@@ -1,13 +1,9 @@
-use framework::{BitstreamFilter, bitstream_filter_main};
+use crate::{BLOCK_SIZE, Frame, LastFrames, frame_to_frame_rect_copy};
+use framework::BitstreamFilter;
 use glam::{I16Vec2, i16vec2};
-use mtree_test::{BLOCK_SIZE, Frame, LastFrames, frame_to_frame_rect_copy};
-use std::{collections::VecDeque, io::Result};
+use std::collections::VecDeque;
 
-fn main() -> Result<()> {
-    bitstream_filter_main::<Dec>()
-}
-
-struct Dec {
+pub struct Dec {
     res: I16Vec2,
     last: LastFrames,
 }
diff --git a/mtree-test/src/bin/encode.rs b/mtree-test/src/encode.rs
index 80f3499..d746e7f 100644
--- a/mtree-test/src/bin/encode.rs
+++ b/mtree-test/src/encode.rs
@@ -1,17 +1,13 @@
-use framework::{BitstreamFilter, bitstream_filter_main};
+use crate::{AbsRef, BLOCK_SIZE, Frame, LastFrames, frame_to_frame_rect_copy};
+use framework::BitstreamFilter;
 use glam::{I16Vec2, i16vec2};
-use mtree_test::{AbsRef, BLOCK_SIZE, Frame, LastFrames, frame_to_frame_rect_copy};
 use rayon::{
-    iter::{IntoParallelIterator, IntoParallelRefIterator, ParallelIterator},
+    iter::{IntoParallelRefIterator, ParallelIterator},
     join,
 };
-use std::{collections::VecDeque, io::Result, time::Instant};
+use std::{collections::VecDeque, time::Instant};
 
-fn main() -> Result<()> {
-    bitstream_filter_main::<Enc>()
-}
-
-struct Enc {
+pub struct Enc {
     res: I16Vec2,
     last: LastFrames,
     tree: MTree,
diff --git a/mtree-test/src/lib.rs b/mtree-test/src/main.rs
index fd282db..3952722 100644
--- a/mtree-test/src/lib.rs
+++ b/mtree-test/src/main.rs
@@ -1,5 +1,19 @@
+pub mod decode;
+pub mod encode;
+
+use decode::Dec;
+use encode::Enc;
+use framework::bitstream_filter_main;
 use glam::{I16Vec2, i16vec2};
-use std::{collections::VecDeque, ops::Range};
+use std::{collections::VecDeque, env::args, ops::Range};
+
+fn main() -> Result<(), std::io::Error> {
+    match args().nth(1).unwrap().as_str() {
+        "enc" => bitstream_filter_main::<Enc>(),
+        "dec" => bitstream_filter_main::<Dec>(),
+        _ => panic!("unknown mode"),
+    }
+}
 
 pub const BLOCK_SIZE: i16 = 8;