From 1d4384c8e28c442cc87189b439564828edeefad2 Mon Sep 17 00:00:00 2001 From: Serial <69764315+Serial-ATA@users.noreply.github.com> Date: Sun, 31 Dec 2023 14:03:04 -0500 Subject: [PATCH] Tests: Fixup some TagLib tests where TagLib is incorrect --- tests/taglib/test_mp4.rs | 12 ++++++------ tests/taglib/test_speex.rs | 1 + 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/tests/taglib/test_mp4.rs b/tests/taglib/test_mp4.rs index 35e708979..1bcb7d612 100644 --- a/tests/taglib/test_mp4.rs +++ b/tests/taglib/test_mp4.rs @@ -40,7 +40,7 @@ fn test_properties_aac_without_bitrate() { assert_eq!(f.properties().audio_bitrate(), 3); assert_eq!(f.properties().channels(), 2); assert_eq!(f.properties().sample_rate(), 44100); - assert_eq!(f.properties().bit_depth(), Some(16)); + assert_eq!(f.properties().bit_depth(), None); // TagLib reports 16, but the stream is a lossy codec assert!(!f.properties().is_drm_protected()); assert_eq!(f.properties().codec(), &Mp4Codec::AAC); } @@ -50,7 +50,7 @@ fn test_properties_alac() { let f = get_file::("tests/taglib/data/empty_alac.m4a"); assert_eq!(f.properties().duration().as_secs(), 3); assert_eq!(f.properties().duration().as_millis(), 3705); - assert_eq!(f.properties().audio_bitrate(), 3); + assert_eq!(f.properties().audio_bitrate(), 2); // TagLib is off by one (reports 3) assert_eq!(f.properties().channels(), 2); assert_eq!(f.properties().sample_rate(), 44100); assert_eq!(f.properties().bit_depth(), Some(16)); @@ -72,10 +72,10 @@ fn test_properties_alac_without_bitrate() { alac_data[i] = 0; } - let f = Mp4File::read_from(&mut file, ParseOptions::new()).unwrap(); + let f = Mp4File::read_from(&mut std::io::Cursor::new(alac_data), ParseOptions::new()).unwrap(); assert_eq!(f.properties().duration().as_secs(), 3); assert_eq!(f.properties().duration().as_millis(), 3705); - assert_eq!(f.properties().audio_bitrate(), 3); + assert_eq!(f.properties().audio_bitrate(), 2); // TagLib is off by one (reports 3) assert_eq!(f.properties().channels(), 2); assert_eq!(f.properties().sample_rate(), 44100); assert_eq!(f.properties().bit_depth(), Some(16)); @@ -88,10 +88,10 @@ fn test_properties_m4v() { let f = get_file::("tests/taglib/data/blank_video.m4v"); assert_eq!(f.properties().duration().as_secs(), 0); assert_eq!(f.properties().duration().as_millis(), 975); - assert_eq!(f.properties().audio_bitrate(), 96); + assert_eq!(f.properties().audio_bitrate(), 95); // TagLib is off by one (reports 96) assert_eq!(f.properties().channels(), 2); assert_eq!(f.properties().sample_rate(), 44100); - assert_eq!(f.properties().bit_depth(), Some(16)); + assert_eq!(f.properties().bit_depth(), None); // TagLib reports 16, but the stream is a lossy codec assert!(!f.properties().is_drm_protected()); assert_eq!(f.properties().codec(), &Mp4Codec::AAC); } diff --git a/tests/taglib/test_speex.rs b/tests/taglib/test_speex.rs index 7f9edb33b..afc436bf8 100644 --- a/tests/taglib/test_speex.rs +++ b/tests/taglib/test_speex.rs @@ -22,6 +22,7 @@ fn test_audio_properties() { // TODO: This test doesn't work, it's very specific with file/packet sizes. Have to determine whether or not to even keep this one. #[test] +#[ignore] fn test_split_packets() { let mut file = temp_file!("tests/taglib/data/empty.spx");