rearrange files

21 files changed, 45 insertions, 28 deletions

diff --git a/lvc/Cargo.lock b/lvc/Cargo.lock
index d7bc0da..aa2f8b5 100644
--- a/lvc/Cargo.lock
+++ b/lvc/Cargo.lock
@@ -3,6 +3,14 @@
 version = 3
 
 [[package]]
+name = "app"
+version = "0.1.0"
+dependencies = [
+ "bv1",
+ "clap",
+]
+
+[[package]]
 name = "autocfg"
 version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -15,6 +23,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
+name = "bv1"
+version = "0.1.0"
+dependencies = [
+ "rayon",
+]
+
+[[package]]
 name = "cc"
 version = "1.0.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -189,14 +204,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4"
 
 [[package]]
-name = "lvc"
-version = "0.1.0"
-dependencies = [
- "clap",
- "rayon",
-]
-
-[[package]]
 name = "memoffset"
 version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
diff --git a/lvc/Cargo.toml b/lvc/Cargo.toml
index 0a4a301..b45cf70 100644
--- a/lvc/Cargo.toml
+++ b/lvc/Cargo.toml
@@ -1,9 +1,3 @@
-[package]
-name = "lvc"
-version = "0.1.0"
-edition = "2021"
-default-run = "main"
-
-[dependencies]
-rayon = "1.7.0"
-clap = { version = "4.1.8", features = ["derive"] }
+[workspace]
+members = ["codec", "app"]
+default-members = ["app"]
diff --git a/lvc/app/Cargo.toml b/lvc/app/Cargo.toml
new file mode 100644
index 0000000..e433e4f
--- /dev/null
+++ b/lvc/app/Cargo.toml
@@ -0,0 +1,9 @@
+[package]
+name = "app"
+version = "0.1.0"
+edition = "2021"
+default-run = "main"
+
+[dependencies]
+clap = { version = "4.1.8", features = ["derive"] }
+bv1 = { path = "../codec" }
diff --git a/lvc/src/bin/bench.rs b/lvc/app/src/bin/bench.rs
index 37036f6..b9c6464 100644
--- a/lvc/src/bin/bench.rs
+++ b/lvc/app/src/bin/bench.rs
@@ -1,4 +1,4 @@
-use lvc::{diff::*, Frame, Ref, View, P2};
+use bv1::{diff::*, Frame, Ref, View, P2};
 use std::time::Instant;
 
 fn measure(f: impl FnOnce()) {
diff --git a/lvc/src/bin/main.rs b/lvc/app/src/bin/main.rs
index 6037855..79869c3 100644
--- a/lvc/src/bin/main.rs
+++ b/lvc/app/src/bin/main.rs
@@ -1,11 +1,11 @@
-use clap::{Parser, Subcommand};
-use lvc::{
+use bv1::{
     debug::draw_debug,
     decode::decode,
     encode::{encode, EncodeConfig},
     huff::{read_huff, write_huff},
     Block, Frame, Pixel, PixelValue, View, P2,
 };
+use clap::{Parser, Subcommand};
 use std::{
     io::{stdin, stdout, BufReader, BufWriter, Read, Write},
     time::Instant,
@@ -15,10 +15,10 @@ use std::{
 #[clap(about, version)]
 struct Args {
     // Width of the video signal
-    #[arg(short, long)]
+    #[arg(short = 'W', long)]
     width: u16,
     // Height of the video signal
-    #[arg(short, long)]
+    #[arg(short = 'H', long)]
     height: u16,
     #[clap(subcommand)]
     action: Action,
diff --git a/lvc/src/bin/test.rs b/lvc/app/src/bin/test.rs
index f4e0ed4..4071ff1 100644
--- a/lvc/src/bin/test.rs
+++ b/lvc/app/src/bin/test.rs
@@ -1,7 +1,7 @@
 #[cfg(test)]
 mod test {
 
-    use lvc::huff::{read_huff, write_huff, BitIO};
+    use bv1::huff::{read_huff, write_huff, BitIO};
     use std::io::Cursor;
 
     #[test]
diff --git a/lvc/codec/Cargo.toml b/lvc/codec/Cargo.toml
new file mode 100644
index 0000000..67189bb
--- /dev/null
+++ b/lvc/codec/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+name = "bv1"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+rayon = "1.7.0"
diff --git a/lvc/src/debug.rs b/lvc/codec/src/debug.rs
index d6c37c2..d6c37c2 100644
--- a/lvc/src/debug.rs
+++ b/lvc/codec/src/debug.rs
diff --git a/lvc/src/decode.rs b/lvc/codec/src/decode.rs
index 771cba9..771cba9 100644
--- a/lvc/src/decode.rs
+++ b/lvc/codec/src/decode.rs
diff --git a/lvc/src/diff.rs b/lvc/codec/src/diff.rs
index 4d1a805..4d1a805 100644
--- a/lvc/src/diff.rs
+++ b/lvc/codec/src/diff.rs
diff --git a/lvc/src/encode.rs b/lvc/codec/src/encode.rs
index 030e882..030e882 100644
--- a/lvc/src/encode.rs
+++ b/lvc/codec/src/encode.rs
diff --git a/lvc/src/huff.rs b/lvc/codec/src/huff.rs
index 6d74c42..6d74c42 100644
--- a/lvc/src/huff.rs
+++ b/lvc/codec/src/huff.rs
diff --git a/lvc/src/impls.rs b/lvc/codec/src/impls.rs
index 098db39..098db39 100644
--- a/lvc/src/impls.rs
+++ b/lvc/codec/src/impls.rs
diff --git a/lvc/src/lib.rs b/lvc/codec/src/lib.rs
index 5ebd91c..5ebd91c 100644
--- a/lvc/src/lib.rs
+++ b/lvc/codec/src/lib.rs
diff --git a/lvc/src/serialize.rs b/lvc/codec/src/serialize.rs
index ac6230e..ac6230e 100644
--- a/lvc/src/serialize.rs
+++ b/lvc/codec/src/serialize.rs
diff --git a/lvc/src/split.rs b/lvc/codec/src/split.rs
index c17179e..c17179e 100644
--- a/lvc/src/split.rs
+++ b/lvc/codec/src/split.rs
diff --git a/lvc/tools/d-disp b/lvc/tools/d-disp
index f62d229..d7b8feb 100755
--- a/lvc/tools/d-disp
+++ b/lvc/tools/d-disp
@@ -1,2 +1,2 @@
 #!/bin/fish
-cargo run --release -- -w 1920 -h 1080 decode | ffplay -loglevel quiet -video_size 1920x1080 -pixel_format rgb24 -f rawvideo pipe:0
\ No newline at end of file
+cargo run --release -- -W 1920 -H 1080 decode | ffplay -loglevel quiet -video_size 1920x1080 -pixel_format rgb24 -f rawvideo pipe:0
\ No newline at end of file
diff --git a/lvc/tools/d-dispd b/lvc/tools/d-dispd
index dac3faf..97a2b90 100755
--- a/lvc/tools/d-dispd
+++ b/lvc/tools/d-dispd
@@ -1,2 +1,2 @@
 #!/bin/fish
-cargo run --release -- -w 1920 -h 1080 decode --debug | ffplay -loglevel quiet -video_size 1920x1080 -pixel_format rgb24 -f rawvideo pipe:0
\ No newline at end of file
+cargo run --release -- -W 1920 -H 1080 decode --debug | ffplay -loglevel quiet -video_size 1920x1080 -pixel_format rgb24 -f rawvideo pipe:0
\ No newline at end of file
diff --git a/lvc/tools/d-save b/lvc/tools/d-save
index 270578a..1f19994 100755
--- a/lvc/tools/d-save
+++ b/lvc/tools/d-save
@@ -1,2 +1,2 @@
 #!/bin/fish
-cargo run --release -- -w 1920 -h 1080 decode | ffmpeg -pixel_format rgb24 -video_size 1920x1080 -framerate 30 -f rawvideo -i pipe:0 -i $argv[1] -map '0:v' -map '1:a' -c:v libsvtav1 -y data/output.webm
+cargo run --release -- -W 1920 -H 1080 decode | ffmpeg -pixel_format rgb24 -video_size 1920x1080 -framerate 30 -f rawvideo -i pipe:0 -i $argv[1] -map '0:v' -map '1:a' -c:v libsvtav1 -y data/output.webm
diff --git a/lvc/tools/d-saved b/lvc/tools/d-saved
index 833ae5d..16de45a 100755
--- a/lvc/tools/d-saved
+++ b/lvc/tools/d-saved
@@ -1,2 +1,2 @@
 #!/bin/fish
-cargo run --release -- -w 1920 -h 1080 decode --debug | ffmpeg -pixel_format rgb24 -video_size 1920x1080 -framerate 30 -f rawvideo -i pipe:0 -i $argv[1] -map '0:v' -map '1:a' -c:v libsvtav1 -y data/output-debug.webm
+cargo run --release -- -W 1920 -H 1080 decode --debug | ffmpeg -pixel_format rgb24 -video_size 1920x1080 -framerate 30 -f rawvideo -i pipe:0 -i $argv[1] -map '0:v' -map '1:a' -c:v libsvtav1 -y data/output-debug.webm
diff --git a/lvc/tools/e b/lvc/tools/e
index 89d822a..a85a767 100755
--- a/lvc/tools/e
+++ b/lvc/tools/e
@@ -1,2 +1,2 @@
 #!/bin/fish
-ffmpeg -loglevel quiet -i $argv[1] -vf format=rgb24 -f rawvideo pipe:1 | cargo run --release -- -w 1920 -h 1080 encode $argv[2..]
+ffmpeg -loglevel quiet -i $argv[1] -vf format=rgb24 -f rawvideo pipe:1 | cargo run --release -- -W 1920 -H 1080 encode $argv[2..]