X-Git-Url: https://git.nihav.org/?p=nihav.git;a=blobdiff_plain;f=nihav-duck%2Fsrc%2Fcodecs%2Ftruemotion1.rs;h=e1d0557e792049b8c43d36373acbd490033f6a46;hp=c313b137677407dd1fa8cbff619f16404e365a18;hb=78fb6560c73965d834b215fb0b49505ae5443288;hpb=f9be4e750dccff762b9a3d894faec50ffdb59233

diff --git a/nihav-duck/src/codecs/truemotion1.rs b/nihav-duck/src/codecs/truemotion1.rs
index c313b13..e1d0557 100644
--- a/nihav-duck/src/codecs/truemotion1.rs
+++ b/nihav-duck/src/codecs/truemotion1.rs
@@ -659,7 +659,13 @@ impl NADecoder for TM1Decoder {
     }
 }
 
-pub fn get_decoder() -> Box<dyn NADecoder> {
+impl NAOptionHandler for TM1Decoder {
+    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() -> Box<dyn NADecoder + Send> {
     Box::new(TM1Decoder::new())
 }
 
@@ -667,24 +673,41 @@ pub fn get_decoder() -> 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_tm1() {
         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);
 
+        test_decoding("avi", "truemotion1", "assets/Duck/phant2-940.duk", Some(12), &dmx_reg, &dec_reg,
+                      ExpectedTestResult::MD5Frames(vec![
+                        [0x989e62b8, 0x5d85c23c, 0x1cffba6d, 0xe599f1c4],
+                        [0xc4231321, 0x25561487, 0x9db11f57, 0x4faeb9a5],
+                        [0x36e3a831, 0xdbd21f89, 0x0a446071, 0xf6d31ee7],
+                        [0x0af640af, 0x64bc2bac, 0x0e95dd72, 0x9e55360b],
+                        [0xbc9c5f8b, 0x6c06f2bc, 0x216f4129, 0x3a421337],
+                        [0xd8ea7297, 0xce5f79fc, 0x46071f4c, 0xaed7fb7a],
+                        [0x87617060, 0x72ce8df8, 0xde42eaa6, 0x804a6f45],
+                        [0xfd8c45b3, 0xf424b683, 0xb4d6a9bd, 0xc622d0b9],
+                        [0x6c233746, 0xba8ed68e, 0xc0ed0e85, 0xc99e1dc0],
+                        [0x5842aac0, 0xd3d78242, 0x5da21218, 0xea1ed0ad],
+                        [0xdea0db20, 0xe2ce3586, 0xf7386649, 0xecc374f9],
+                        [0xb80ae9cb, 0x04eb938e, 0xd8a337ee, 0x0054b5ed],
+                        [0xf8b80e1d, 0xd8eb3d6c, 0xa99b23ff, 0x562851a1]]));
+        test_decoding("avi", "truemotion1", "assets/Duck/SPRITES.AVI", Some(2), &dmx_reg, &dec_reg,
+                      ExpectedTestResult::MD5([0xb89a4275, 0xf9797f5f, 0xe53c1ccd, 0xfa163e02]));
         //let file = "assets/Duck/AVI-DUCK-dk3.duk";
-        let file = "assets/Duck/phant2-940.duk";
+        //let file = "assets/Duck/phant2-940.duk";
         //let file = "assets/Duck/bugsampler-m01-16bit.avi";
         //let file = "assets/Duck/sonic3dblast_intro.avi";
         //let file = "assets/Duck/BUTTONS.AVI";
         //let file = "assets/Duck/SPRITES.AVI";
         //let file = "assets/Duck/TRICORD.AVI";
-        test_file_decoding("avi", file, Some(42), true, false, None/*Some("tm1-")*/, &dmx_reg, &dec_reg);
+        //test_file_decoding("avi", file, Some(42), true, false, None/*Some("tm1-")*/, &dmx_reg, &dec_reg);
     }
 }