Bump av-metrics-decoders in other av-metrics crates (#298)

* Bump decoder crate in av-metrics-tool

* Bump decoder crate in av-metrics-tests

* Ignore unused imports in tests

* Hide import behind feature flag

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"]

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;
@@ -8,11 +10,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<P: AsRef<Path>>(input: P) -> Result<Y4MDecoder, String> {
-        Y4MDecoder::new(input)
+    fn get_decoder<P: AsRef<Path>>(input: P) -> Result<Y4MDecoder<BufReader<File>>, String> {
+        av_metrics_decoders::y4m::new_decoder_from_file(input)
     }
 
     #[cfg(feature = "ffmpeg")]

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"

av_metrics_tool/src/main.rs

@@ -12,6 +12,8 @@ use indicatif::{ProgressBar, ProgressStyle};
 use serde::Serialize;
 use std::error::Error;
 use std::fs::File;
+#[cfg(not(feature = "ffmpeg"))]
+use std::io::BufReader;
 use std::io::{BufWriter, Stdout, Write};
 use std::path::Path;
 
@@ -166,8 +168,8 @@ impl InputType {
 }
 
 #[cfg(not(feature = "ffmpeg"))]
-pub fn get_decoder<P: AsRef<Path>>(input: P) -> Result<Y4MDecoder, String> {
-    Y4MDecoder::new(input)
+pub fn get_decoder<P: AsRef<Path>>(input: P) -> Result<Y4MDecoder<BufReader<File>>, String> {
+    av_metrics_decoders::y4m::new_decoder_from_file(input)
 }
 
 #[cfg(feature = "ffmpeg")]