From 624471a4b1f2e1656a2ba46070d8f127dcd0e364 Mon Sep 17 00:00:00 2001 From: metamuffin Date: Tue, 6 Dec 2022 16:42:06 +0100 Subject: use env_logger --- evc/.gitignore | 1 + evc/Cargo.lock | 68 +++++++++++++++++++++++++++++++++++++++++++++++++ evc/Cargo.toml | 2 ++ evc/scripts/report | 9 +++++++ evc/src/bin/decode.rs | 6 +++-- evc/src/bin/encode.rs | 4 ++- evc/src/codec/encode.rs | 2 +- 7 files changed, 88 insertions(+), 4 deletions(-) create mode 100755 evc/scripts/report diff --git a/evc/.gitignore b/evc/.gitignore index 0f285c7..870bad6 100644 --- a/evc/.gitignore +++ b/evc/.gitignore @@ -1,2 +1,3 @@ /target /samples +/reports diff --git a/evc/Cargo.lock b/evc/Cargo.lock index 84e5513..e804305 100644 --- a/evc/Cargo.lock +++ b/evc/Cargo.lock @@ -2,6 +2,15 @@ # It is not intended for manual editing. version = 3 +[[package]] +name = "aho-corasick" +version = "0.7.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" +dependencies = [ + "memchr", +] + [[package]] name = "anyhow" version = "1.0.66" @@ -20,6 +29,12 @@ version = "1.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e9f73505338f7d905b19d18738976aae232eb46b8efc15554ffc56deb5d9ebe4" +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + [[package]] name = "clap" version = "4.0.29" @@ -57,6 +72,19 @@ dependencies = [ "os_str_bytes", ] +[[package]] +name = "env_logger" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" +dependencies = [ + "humantime", + "is-terminal", + "log", + "regex", + "termcolor", +] + [[package]] name = "errno" version = "0.2.8" @@ -84,6 +112,8 @@ version = "0.1.0" dependencies = [ "anyhow", "clap", + "env_logger", + "log", ] [[package]] @@ -101,6 +131,12 @@ dependencies = [ "libc", ] +[[package]] +name = "humantime" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" + [[package]] name = "io-lifetimes" version = "1.0.3" @@ -135,6 +171,21 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f9f08d8963a6c613f4b1a78f4f4a4dbfadf8e6545b2d72861731e4858b8b47f" +[[package]] +name = "log" +version = "0.4.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + [[package]] name = "once_cell" version = "1.16.0" @@ -189,6 +240,23 @@ dependencies = [ "proc-macro2", ] +[[package]] +name = "regex" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.6.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" + [[package]] name = "rustix" version = "0.36.4" diff --git a/evc/Cargo.toml b/evc/Cargo.toml index 43818ee..b5e9ee9 100644 --- a/evc/Cargo.toml +++ b/evc/Cargo.toml @@ -6,3 +6,5 @@ edition = "2021" [dependencies] clap = { version = "*", features = ["derive"] } anyhow = "1.0.66" +log = "0.4.17" +env_logger = "0.10.0" diff --git a/evc/scripts/report b/evc/scripts/report new file mode 100755 index 0000000..fee3c54 --- /dev/null +++ b/evc/scripts/report @@ -0,0 +1,9 @@ +#!/bin/fish +cargo build --release +begin + echo "version: $argv[1]" + echo "commit: $(cat ../.git/refs/heads/master | head -c 10)" + echo "encode: $(command time -f %U ./target/release/encode -W 1920 -H 1080 samples/encoded 2>| tail -n 1)s" + echo "decode: $(command time -f %U ./target/release/decode samples/decoded 2>| tail -n 1)s" + echo "size: $(du -h samples/encoded | cut -f 1)" +end | tee -a reports/(date) diff --git a/evc/src/bin/decode.rs b/evc/src/bin/decode.rs index 1500633..7089de5 100644 --- a/evc/src/bin/decode.rs +++ b/evc/src/bin/decode.rs @@ -10,6 +10,7 @@ use evc::{ ser::Source, view::View, }; +use log::info; use std::io::{BufReader, BufWriter}; #[derive(Parser)] @@ -20,18 +21,19 @@ pub struct DecodeArgs { } fn main() -> anyhow::Result<()> { + env_logger::init_from_env("LOG"); let args = DecodeArgs::parse(); let mut input = BufReader::new(std::io::stdin()); let mut output = BufWriter::new(std::io::stdout()); let header = input.get::
().context("reading header")?; - eprintln!("{header:?}"); + info!("{header:?}"); let size = header.resolution; let mut prev = Frame::new(size); for i in 0.. { - eprintln!("decode frame {i}"); + info!("decode frame {i}"); let block = Block::read(&mut input, size).context("reading encoded frame")?; let mut frame = Frame::new(size); diff --git a/evc/src/bin/encode.rs b/evc/src/bin/encode.rs index 50435e5..acd6e92 100644 --- a/evc/src/bin/encode.rs +++ b/evc/src/bin/encode.rs @@ -6,6 +6,7 @@ use evc::{ header::Header, ser::Sink, }; +use log::info; use std::io::{BufReader, BufWriter}; #[derive(Parser)] @@ -18,6 +19,7 @@ pub struct EncodeArgs { } fn main() -> anyhow::Result<()> { + env_logger::init_from_env("LOG"); let args = EncodeArgs::parse(); let mut input = BufReader::new(std::io::stdin()); @@ -33,7 +35,7 @@ fn main() -> anyhow::Result<()> { let mut prev_frame = Frame::new(size); for i in 0.. { - eprintln!("encode frame {i}"); + info!("encode frame {i}"); let mut frame = Frame::read(&mut input, size) .context("reading raw frame") .unwrap(); diff --git a/evc/src/codec/encode.rs b/evc/src/codec/encode.rs index cf407fa..1729e94 100644 --- a/evc/src/codec/encode.rs +++ b/evc/src/codec/encode.rs @@ -12,7 +12,7 @@ pub fn encode_block(view: View<&Frame>, prev: View<&Frame>) -> Block { translation: (0, 0), } } else { - if view.size.0 < 32 { + if view.size.0 < 16 { BlockInner::Literal(view.pixels()) } else { let [av, bv] = view.split(); -- cgit v1.2.3-70-g09d2