From 2764b18120cba01fa5f8a78c4ce15a3eeec710f7 Mon Sep 17 00:00:00 2001 From: FreezyLemon Date: Fri, 15 Mar 2024 20:49:39 +0100 Subject: [PATCH 1/4] Bump decoder crate in av-metrics-tool --- Cargo.lock | 2 +- av_metrics_tool/Cargo.toml | 2 +- av_metrics_tool/src/main.rs | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c746375..b0e1827 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -120,7 +120,7 @@ name = "av-metrics-tool" version = "0.9.1" dependencies = [ "av-metrics", - "av-metrics-decoders 0.2.3", + "av-metrics-decoders 0.3.1", "clap", "console", "indicatif", diff --git a/av_metrics_tool/Cargo.toml b/av_metrics_tool/Cargo.toml index fb63458..9cda979 100644 --- a/av_metrics_tool/Cargo.toml +++ b/av_metrics_tool/Cargo.toml @@ -10,7 +10,7 @@ include = ["src/**/*", "LICENSE"] [dependencies] av-metrics = { version = "0.9", features = ["serde"] } -av-metrics-decoders = "0.2.1" +av-metrics-decoders = "0.3.1" clap = "4" console = "0.15.0" indicatif = "0.17.1" diff --git a/av_metrics_tool/src/main.rs b/av_metrics_tool/src/main.rs index 8f2baf0..85690b9 100644 --- a/av_metrics_tool/src/main.rs +++ b/av_metrics_tool/src/main.rs @@ -12,7 +12,7 @@ use indicatif::{ProgressBar, ProgressStyle}; use serde::Serialize; use std::error::Error; use std::fs::File; -use std::io::{BufWriter, Stdout, Write}; +use std::io::{BufReader, BufWriter, Stdout, Write}; use std::path::Path; fn main() -> Result<(), String> { @@ -166,8 +166,8 @@ impl InputType { } #[cfg(not(feature = "ffmpeg"))] -pub fn get_decoder>(input: P) -> Result { - Y4MDecoder::new(input) +pub fn get_decoder>(input: P) -> Result>, String> { + av_metrics_decoders::y4m::new_decoder_from_file(input) } #[cfg(feature = "ffmpeg")] From bd02932d8c82947a775a6d88d6d0bcefa2a3a82c Mon Sep 17 00:00:00 2001 From: FreezyLemon Date: Fri, 15 Mar 2024 20:51:13 +0100 Subject: [PATCH 2/4] Bump decoder crate in av-metrics-tests --- Cargo.lock | 24 +++--------------------- av_metrics_tests/Cargo.toml | 2 +- av_metrics_tests/src/lib.rs | 6 ++++-- 3 files changed, 8 insertions(+), 24 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b0e1827..702c6ca 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -84,18 +84,6 @@ dependencies = [ "y4m", ] -[[package]] -name = "av-metrics-decoders" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "347427ab632003ebaba20436bb60584dd396f50d4c0093044dcd6191991274e3" -dependencies = [ - "anyhow", - "av-metrics", - "ffmpeg-the-third", - "y4m", -] - [[package]] name = "av-metrics-decoders" version = "0.3.1" @@ -112,7 +100,7 @@ name = "av-metrics-tests" version = "0.0.1" dependencies = [ "av-metrics", - "av-metrics-decoders 0.2.3", + "av-metrics-decoders", ] [[package]] @@ -120,7 +108,7 @@ name = "av-metrics-tool" version = "0.9.1" dependencies = [ "av-metrics", - "av-metrics-decoders 0.3.1", + "av-metrics-decoders", "clap", "console", "indicatif", @@ -140,7 +128,7 @@ dependencies = [ "itertools", "lazy_static", "lazycell", - "proc-macro2", + "proc-macro2", "quote", "regex", "rustc-hash", @@ -624,12 +612,6 @@ version = "11.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" -[[package]] -name = "peeking_take_while" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" - [[package]] name = "pkg-config" version = "0.3.26" diff --git a/av_metrics_tests/Cargo.toml b/av_metrics_tests/Cargo.toml index 02e1deb..7bf6f52 100644 --- a/av_metrics_tests/Cargo.toml +++ b/av_metrics_tests/Cargo.toml @@ -8,7 +8,7 @@ publish = false [dependencies] av-metrics = { version = "0.9", features = ["serde"] } -av-metrics-decoders = "0.2.1" +av-metrics-decoders = "0.3.1" [features] default = ["y4m"] diff --git a/av_metrics_tests/src/lib.rs b/av_metrics_tests/src/lib.rs index 5bec3e1..2242905 100644 --- a/av_metrics_tests/src/lib.rs +++ b/av_metrics_tests/src/lib.rs @@ -8,11 +8,13 @@ mod tests { use av_metrics_decoders::FfmpegDecoder; #[cfg(not(feature = "ffmpeg"))] use av_metrics_decoders::Y4MDecoder; + use std::fs::File; + use std::io::BufReader; use std::path::Path; #[cfg(not(feature = "ffmpeg"))] - fn get_decoder>(input: P) -> Result { - Y4MDecoder::new(input) + fn get_decoder>(input: P) -> Result>, String> { + av_metrics_decoders::y4m::new_decoder_from_file(input) } #[cfg(feature = "ffmpeg")] From 93e7f39ca2ef0eb8b4ff5c4515e7c86240d6de0d Mon Sep 17 00:00:00 2001 From: FreezyLemon Date: Sun, 7 Apr 2024 00:06:10 +0200 Subject: [PATCH 3/4] Ignore unused imports in tests --- av_metrics_tests/src/lib.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/av_metrics_tests/src/lib.rs b/av_metrics_tests/src/lib.rs index 2242905..ea772f0 100644 --- a/av_metrics_tests/src/lib.rs +++ b/av_metrics_tests/src/lib.rs @@ -1,5 +1,7 @@ #[cfg(test)] mod tests { + #![allow(unused_imports)] + use av_metrics::video::ciede::{calculate_video_ciede, calculate_video_ciede_nosimd}; use av_metrics::video::psnr::{calculate_video_apsnr, calculate_video_psnr}; use av_metrics::video::psnr_hvs::calculate_video_psnr_hvs; From 584d1071037c513a0b8a22f9cc00ebf72b2efe83 Mon Sep 17 00:00:00 2001 From: FreezyLemon Date: Tue, 27 Aug 2024 18:44:57 +0200 Subject: [PATCH 4/4] Hide import behind feature flag --- av_metrics_tool/src/main.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/av_metrics_tool/src/main.rs b/av_metrics_tool/src/main.rs index 85690b9..4cbbe21 100644 --- a/av_metrics_tool/src/main.rs +++ b/av_metrics_tool/src/main.rs @@ -12,7 +12,9 @@ use indicatif::{ProgressBar, ProgressStyle}; use serde::Serialize; use std::error::Error; use std::fs::File; -use std::io::{BufReader, BufWriter, Stdout, Write}; +#[cfg(not(feature = "ffmpeg"))] +use std::io::BufReader; +use std::io::{BufWriter, Stdout, Write}; use std::path::Path; fn main() -> Result<(), String> {