From ba3295885c768f1299b2e547432c8b8062c7b555 Mon Sep 17 00:00:00 2001
From: Zen <46526140+master-of-zen@users.noreply.github.com>
Date: Mon, 16 Aug 2021 20:17:33 +0300
Subject: [PATCH] removed --webm flag
---
README.md | 3 ---
av1an-cli/src/lib.rs | 4 ----
av1an-cli/src/main.rs | 3 ++-
av1an-core/Cargo.toml | 15 +++++++++------
av1an-core/src/lib.rs | 2 --
5 files changed, 11 insertions(+), 16 deletions(-)
diff --git a/README.md b/README.md
index 19d8f4f..0f7e840 100644
--- a/README.md
+++ b/README.md
@@ -61,9 +61,6 @@ With your own parameters:
-c --concat Concatenation method to use for splits Default: ffmpeg
[possible values: ffmpeg, mkvmerge, ivf]
- --webm Outputs webm file.
- Use only if you're sure the source video and audio are compatible.
-
FFmpeg options
-a --audio-params FFmpeg audio settings (Default: copy audio from source to output)
diff --git a/av1an-cli/src/lib.rs b/av1an-cli/src/lib.rs
index fe05746..97b5d9f 100644
--- a/av1an-cli/src/lib.rs
+++ b/av1an-cli/src/lib.rs
@@ -46,10 +46,6 @@ pub struct Args {
#[clap(long)]
pub keep: bool,
- /// Output to webm
- #[clap(long)]
- pub webm: bool,
-
/// Method for creating chunks
#[clap(short = 'm', long, possible_values=&["segment", "select", "ffms2", "lsmash", "hybrid"])]
pub chunk_method: Option,
diff --git a/av1an-cli/src/main.rs b/av1an-cli/src/main.rs
index ac0a18d..85b7aa8 100644
--- a/av1an-cli/src/main.rs
+++ b/av1an-cli/src/main.rs
@@ -44,8 +44,10 @@ pub fn main() {
},
output_file: if let Some(output) = args.output_file {
if !output.parent().unwrap().exists() && output.parent().unwrap() == PathBuf::new() {
+ // ^ Check if path is file in current folder
output.to_str().unwrap().to_owned()
} else if output.parent().unwrap().exists() {
+ // ^ Check if path to the file valid
output.to_str().unwrap().to_owned()
} else {
println!("Path to file is invalid {:#?}", &output);
@@ -98,7 +100,6 @@ pub fn main() {
vmaf_filter: args.vmaf_filter,
vmaf_path: args.vmaf_path,
vmaf_res: Some(args.vmaf_res),
- webm: false,
workers: args.workers,
};
diff --git a/av1an-core/Cargo.toml b/av1an-core/Cargo.toml
index 2ae8d02..b979f4c 100644
--- a/av1an-core/Cargo.toml
+++ b/av1an-core/Cargo.toml
@@ -8,26 +8,29 @@ edition = "2018"
[dependencies]
log = "0.4.14"
av-format = "0.3.1"
-av-ivf = { git = "https://github.com/rust-av/ivf-rs", rev="031aab76d1fc70a4b8518dc2ef5c3f4f1d839721" }
+av-ivf = {git = "https://github.com/rust-av/ivf-rs", rev = "031aab76d1fc70a4b8518dc2ef5c3f4f1d839721"}
num_cpus = "1.13.0"
anyhow = "1.0.42"
serde_json = "1.0"
-serde = { version="1.0", features=["derive"] }
+serde = {version = "1.0", features = ["derive"]}
sysinfo = "0.19.1"
-vapoursynth = { version="0.3.0", features=["vsscript-functions", "vapoursynth-functions"] }
+vapoursynth = {version = "0.3.0", features = [
+ "vsscript-functions",
+ "vapoursynth-functions",
+]}
clap = "2.33.3"
num-rational = "0.4.0"
failure = "0.1.8"
regex = "1.5.4"
plotters = "0.3.1"
splines = "4.0.0"
-indicatif = { git = "https://github.com/mitsuhiko/indicatif", branch = "main" }
+indicatif = {git = "https://github.com/mitsuhiko/indicatif", branch = "main"}
once_cell = "1.8.0"
chrono = "0.4.19"
-strum = { version = "0.21", features = ["derive"] }
+strum = {version = "0.21", features = ["derive"]}
itertools = "0.10.1"
parking_lot = "0.11.1"
-av1an-scene-detection = { path="../av1an-scene-detection" }
+av1an-scene-detection = {path = "../av1an-scene-detection"}
which = "4.1.0"
strsim = "0.10.0"
crossbeam-channel = "0.5.1"
diff --git a/av1an-core/src/lib.rs b/av1an-core/src/lib.rs
index 327b79a..590afa0 100644
--- a/av1an-core/src/lib.rs
+++ b/av1an-core/src/lib.rs
@@ -43,7 +43,6 @@ pub mod split;
pub mod target_quality;
pub mod vapoursynth;
pub mod vmaf;
-
#[macro_export]
macro_rules! into_vec {
($($x:expr),* $(,)?) => {
@@ -803,7 +802,6 @@ pub struct Project {
pub input: String,
pub temp: String,
pub output_file: String,
- pub webm: bool,
pub chunk_method: ChunkMethod,
pub scenes: Option,