binkaud: separate tests for different audio flavours

[nihav.git] / nihav-rad / src / codecs / binkaud.rs

diff --git a/nihav-rad/src/codecs/binkaud.rs b/nihav-rad/src/codecs/binkaud.rs
index 7e34739f07a2f6dbb8992ead35b3aed168e96e5a..479ee35d1b2fac7fc8f54c270d334acae5cfcd6b 100644 (file)
--- a/nihav-rad/src/codecs/binkaud.rs
+++ b/nihav-rad/src/codecs/binkaud.rs
@@ -1,6 +1,6 @@
 use nihav_core::codecs::*;
-use nihav_core::dsp::dct::*;
-use nihav_core::dsp::fft::*;
+use nihav_codec_support::dsp::dct::*;
+use nihav_codec_support::dsp::fft::*;
 use nihav_core::io::bitreader::*;
 use std::f32::consts;
 use std::str::FromStr;
@@ -290,22 +290,28 @@ pub fn get_decoder_rdft() -> Box<dyn NADecoder + Send> {
 mod test {
     use nihav_core::codecs::RegisteredDecoders;
     use nihav_core::demuxers::RegisteredDemuxers;
-    use nihav_core::test::dec_video::*;
+    use nihav_codec_support::test::dec_video::*;
     use crate::rad_register_all_codecs;
     use crate::rad_register_all_demuxers;
 
     #[test]
-    fn test_bink_audio() {
+    fn test_bink_audio_dct() {
         let mut dmx_reg = RegisteredDemuxers::new();
         rad_register_all_demuxers(&mut dmx_reg);
         let mut dec_reg = RegisteredDecoders::new();
         rad_register_all_codecs(&mut dec_reg);
 
-//        let file = "assets/RAD/ActivisionLogo.bik";
-        let file = "assets/RAD/original.bik";
-//        let file = "assets/RAD/Snd0a110c51.dee";
-//        let file = "assets/RAD/NEW.BIK";
-//        let file = "assets/RAD/ge_video_86l.bk2";
+        let file = "assets/RAD/ActivisionLogo.bik";
+        test_decode_audio("bink", file, None, None/*Some("bink")*/, &dmx_reg, &dec_reg);
+    }
+    #[test]
+    fn test_bink_audio_rdft() {
+        let mut dmx_reg = RegisteredDemuxers::new();
+        rad_register_all_demuxers(&mut dmx_reg);
+        let mut dec_reg = RegisteredDecoders::new();
+        rad_register_all_codecs(&mut dec_reg);
+
+        let file = "assets/RAD/NWCLOGO.BIK";
         test_decode_audio("bink", file, None, None/*Some("bink")*/, &dmx_reg, &dec_reg);
     }
 }