rename register_all_codecs to register_all_decoders

[nihav.git] / nihav-duck / src / codecs / dkadpcm.rs

diff --git a/nihav-duck/src/codecs/dkadpcm.rs b/nihav-duck/src/codecs/dkadpcm.rs
index d339556d56fe089da0b1143540af66610723269c..399b4f79b006e923f60a9fdb1035c7cba7d63f44 100644 (file)
--- a/nihav-duck/src/codecs/dkadpcm.rs
+++ b/nihav-duck/src/codecs/dkadpcm.rs
@@ -1,35 +1,8 @@
 use nihav_core::codecs::*;
 use nihav_core::io::byteio::*;
+use nihav_codec_support::codecs::imaadpcm::*;
 use std::str::FromStr;
 
-const IMA_MAX_STEP: u8 = 88;
-struct IMAState {
-    predictor:  i32,
-    step:       usize,
-}
-
-impl IMAState {
-    fn new() -> Self {
-        Self {
-            predictor:  0,
-            step:       0,
-        }
-    }
-    fn reset(&mut self, predictor: i16, step: u8) {
-        self.predictor  = i32::from(predictor);
-        self.step       = step.min(IMA_MAX_STEP) as usize;
-    }
-    fn expand_sample(&mut self, nibble: u8) -> i16 {
-        let istep = (self.step as isize) + (IMA_STEPS[nibble as usize] as isize);
-        let sign = (nibble & 8) != 0;
-        let diff = (i32::from(2 * (nibble & 7) + 1) * IMA_STEP_TABLE[self.step]) >> 3;
-        let sample = if !sign { self.predictor + diff } else { self.predictor - diff };
-        self.predictor = sample.max(i32::from(std::i16::MIN)).min(i32::from(std::i16::MAX));
-        self.step = istep.max(0).min(IMA_MAX_STEP as isize) as usize;
-        self.predictor as i16
-    }
-}
-
 struct DuckADPCMDecoder {
     ainfo:      NAAudioInfo,
     chmap:      NAChannelMap,
@@ -163,13 +136,21 @@ impl NADecoder for DuckADPCMDecoder {
             Err(DecoderError::InvalidData)
         }
     }
+    fn flush(&mut self) {
+    }
 }
 
-pub fn get_decoder_dk3() -> Box<dyn NADecoder> {
+impl NAOptionHandler for DuckADPCMDecoder {
+    fn get_supported_options(&self) -> &[NAOptionDefinition] { &[] }
+    fn set_options(&mut self, _options: &[NAOption]) { }
+    fn query_option_value(&self, _name: &str) -> Option<NAValue> { None }
+}
+
+pub fn get_decoder_dk3() -> Box<dyn NADecoder + Send> {
     Box::new(DuckADPCMDecoder::new(true))
 }
 
-pub fn get_decoder_dk4() -> Box<dyn NADecoder> {
+pub fn get_decoder_dk4() -> Box<dyn NADecoder + Send> {
     Box::new(DuckADPCMDecoder::new(false))
 }
 
@@ -177,46 +158,31 @@ pub fn get_decoder_dk4() -> Box<dyn NADecoder> {
 mod test {
     use nihav_core::codecs::RegisteredDecoders;
     use nihav_core::demuxers::RegisteredDemuxers;
-    use nihav_core::test::dec_video::*;
-    use crate::codecs::duck_register_all_codecs;
-    use nihav_commonfmt::demuxers::generic_register_all_demuxers;
+    use nihav_codec_support::test::dec_video::*;
+    use crate::duck_register_all_decoders;
+    use nihav_commonfmt::generic_register_all_demuxers;
     #[test]
     fn test_dk3() {
         let mut dmx_reg = RegisteredDemuxers::new();
         generic_register_all_demuxers(&mut dmx_reg);
         let mut dec_reg = RegisteredDecoders::new();
-        duck_register_all_codecs(&mut dec_reg);
+        duck_register_all_decoders(&mut dec_reg);
 
-        let file = "assets/Duck/AVI-DUCK-dk3.duk";
-        test_decode_audio("avi", file, Some(100), "dk3", &dmx_reg, &dec_reg);
+        //let file = "assets/Duck/AVI-DUCK-dk3.duk";
+        //test_decode_audio("avi", file, Some(100), None/*Some("dk3")*/, &dmx_reg, &dec_reg);
+        test_decoding("avi", "adpcm-dk3", "assets/Duck/AVI-DUCK-dk3.duk", None, &dmx_reg, &dec_reg,
+                      ExpectedTestResult::MD5([0xa48fae0a, 0xa536b27f, 0x169ecc19, 0x8436fade]));
     }
     #[test]
     fn test_dk4() {
         let mut dmx_reg = RegisteredDemuxers::new();
         generic_register_all_demuxers(&mut dmx_reg);
         let mut dec_reg = RegisteredDecoders::new();
-        duck_register_all_codecs(&mut dec_reg);
+        duck_register_all_decoders(&mut dec_reg);
 
-        let file = "assets/Duck/virtuafighter2-opening1.avi";
-        test_decode_audio("avi", file, Some(100), "dk4", &dmx_reg, &dec_reg);
+//        let file = "assets/Duck/virtuafighter2-opening1.avi";
+//        test_decode_audio("avi", file, Some(100), None/*Some("dk4")*/, &dmx_reg, &dec_reg);
+        test_decoding("avi", "adpcm-dk4", "assets/Duck/virtuafighter2-opening1.avi", None, &dmx_reg, &dec_reg,
+                      ExpectedTestResult::MD5([0x04e40d15, 0xf65b3427, 0x1dd5181f, 0xf321b56f]));
     }
 }
-
-const IMA_STEPS: [i8; 16] = [
-    -1, -1, -1, -1, 2, 4, 6, 8,
-    -1, -1, -1, -1, 2, 4, 6, 8
-];
-
-const IMA_STEP_TABLE: [i32; 89] = [
-        7,     8,     9,    10,    11,    12,    13,    14,
-       16,    17,    19,    21,    23,    25,    28,    31,
-       34,    37,    41,    45,    50,    55,    60,    66,
-       73,    80,    88,    97,   107,   118,   130,   143,
-      157,   173,   190,   209,   230,   253,   279,   307,
-      337,   371,   408,   449,   494,   544,   598,   658,
-      724,   796,   876,   963,  1060,  1166,  1282,  1411,
-     1552,  1707,  1878,  2066,  2272,  2499,  2749,  3024,
-     3327,  3660,  4026,  4428,  4871,  5358,  5894,  6484,
-     7132,  7845,  8630,  9493, 10442, 11487, 12635, 13899,
-    15289, 16818, 18500, 20350, 22385, 24623, 27086, 29794, 32767
-];