X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-duck%2Fsrc%2Fcodecs%2Ftruemotionrt.rs;h=1bbcb0fd4dd8743f62dd9967e74335ff6cc84b76;hb=ce742854b2912b880fb3d3e330042b049dac8504;hp=3b4e9e85b3238c28ba5c9666f29f30420d108c30;hpb=01613464323864a655c994820d3c43df1954e3b2;p=nihav.git

diff --git a/nihav-duck/src/codecs/truemotionrt.rs b/nihav-duck/src/codecs/truemotionrt.rs
index 3b4e9e8..1bbcb0f 100644
--- a/nihav-duck/src/codecs/truemotionrt.rs
+++ b/nihav-duck/src/codecs/truemotionrt.rs
@@ -60,12 +60,10 @@ impl NADecoder for TMRTDecoder {
         let height = (hdr[5] as usize) | ((hdr[6] as usize) << 8);
 
         let myinfo = NAVideoInfo::new(width, height, false, YUV410_FORMAT);
-        let bufret = alloc_video_buffer(myinfo, 2);
-        if let Err(_) = bufret { return Err(DecoderError::InvalidData); }
-        let bufinfo = bufret.unwrap();
+        let bufinfo = alloc_video_buffer(myinfo, 2)?;
         let mut buf = bufinfo.get_vbuf().unwrap();
 
-        let mut br = BitReader::new(&src[hdr_size..], src.len() - hdr_size, BitReaderMode::LE);
+        let mut br = BitReader::new(&src[hdr_size..], BitReaderMode::LE);
         let size                                = br.read(32)? as usize;
         validate!(size <= src.len() - hdr_size);
         for plane in 0..3 {
@@ -82,9 +80,11 @@ impl NADecoder for TMRTDecoder {
         frm.set_frame_type(FrameType::I);
         Ok(frm.into_ref())
     }
+    fn flush(&mut self) {
+    }
 }
 
-pub fn get_decoder() -> Box<NADecoder> {
+pub fn get_decoder() -> Box<dyn NADecoder + Send> {
     Box::new(TMRTDecoder::new())
 }
 
@@ -92,9 +92,9 @@ pub fn get_decoder() -> Box<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_tmrt() {
         let mut dmx_reg = RegisteredDemuxers::new();
@@ -102,6 +102,8 @@ mod test {
         let mut dec_reg = RegisteredDecoders::new();
         duck_register_all_codecs(&mut dec_reg);
 
-        test_file_decoding("avi", "assets/Duck/tr20_low.avi", Some(10), true, false, None/*Some("tmrt")*/, &dmx_reg, &dec_reg);
+        test_decoding("avi", "truemotionrt", "assets/Duck/tr20_low.avi", Some(10),
+                        &dmx_reg, &dec_reg,
+                        ExpectedTestResult::MD5([0x24c3d26c, 0x1e8bbdc4, 0xfb0fba5d, 0xaa04be81]));
     }
 }