X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-duck%2Fsrc%2Fcodecs%2Ftruemotion2x.rs;h=586c26e0a6b1fee46492b85c0d00b660e1be3060;hb=ce742854b2912b880fb3d3e330042b049dac8504;hp=16d1125f71d44bb1f93d722209faba5703c2b6fc;hpb=8a7352c04dd848eea6519f0d775d98d547b90a39;p=nihav.git

diff --git a/nihav-duck/src/codecs/truemotion2x.rs b/nihav-duck/src/codecs/truemotion2x.rs
index 16d1125..586c26e 100644
--- a/nihav-duck/src/codecs/truemotion2x.rs
+++ b/nihav-duck/src/codecs/truemotion2x.rs
@@ -227,7 +227,7 @@ impl TM2XDecoder {
                                           br.read_skip(len)?;
             let _smth                   = br.read_u32be()?;
         }
-        
+
         Ok(())
     }
     fn parse_tabs(&mut self) -> DecoderResult<()> {
@@ -688,9 +688,11 @@ impl NADecoder for TM2XDecoder {
         frm.set_frame_type(if self.is_intra { FrameType::I } else { FrameType::P });
         Ok(frm.into_ref())
     }
+    fn flush(&mut self) {
+    }
 }
 
-pub fn get_decoder() -> Box<dyn NADecoder> {
+pub fn get_decoder() -> Box<dyn NADecoder + Send> {
     Box::new(TM2XDecoder::new())
 }
 
@@ -698,9 +700,9 @@ 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_codecs;
+    use nihav_commonfmt::generic_register_all_demuxers;
     #[test]
     fn test_tm2x() {
         let mut dmx_reg = RegisteredDemuxers::new();
@@ -708,7 +710,15 @@ mod test {
         let mut dec_reg = RegisteredDecoders::new();
         duck_register_all_codecs(&mut dec_reg);
 
-        test_file_decoding("avi", "assets/Duck/TM2x.avi", Some(16), true, false, None/*Some("tm2x")*/, &dmx_reg, &dec_reg);
+        test_decoding("avi", "truemotion2x", "assets/Duck/TM2x.avi", None,
+                        &dmx_reg, &dec_reg, ExpectedTestResult::MD5Frames(vec![
+                            [0x2854e7f3, 0x41e54fd3, 0xd9a16302, 0x580321b2],
+                            [0x8e736f59, 0x57c58dc0, 0xe15bad3a, 0xf96e2c5b],
+                            [0x12700e7c, 0xfa2d06e0, 0x05b758ba, 0xe79aabb6],
+                            [0x29f935f2, 0x2ad0d6d1, 0x2fde19a2, 0x5aa3823b],
+                            [0x7f1a787d, 0x77f3ab61, 0x0e584c66, 0x9d1842ea],
+                            [0xb5607334, 0xdb149056, 0xe0e3ddb5, 0x19f8e254],
+                            [0xb054e4d0, 0x1d241d4f, 0x75fdfe95, 0x9dde8024]]));
     }
 }