X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-duck%2Fsrc%2Fcodecs%2Ftruemotionrt.rs;h=1aa8a29943a6ec6d5ff49229ce88ec01e3273cf5;hb=13078a1fbd4d4839fc3a94c4a46c89d5829f8035;hp=d7b777f78219d08ecc55893a2b0dc7e31bb5084c;hpb=6011e20199143f519881660144a4ca95ba77fd2d;p=nihav.git

diff --git a/nihav-duck/src/codecs/truemotionrt.rs b/nihav-duck/src/codecs/truemotionrt.rs
index d7b777f..1aa8a29 100644
--- a/nihav-duck/src/codecs/truemotionrt.rs
+++ b/nihav-duck/src/codecs/truemotionrt.rs
@@ -60,9 +60,7 @@ 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);
@@ -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<dyn NADecoder> {
+pub fn get_decoder() -> Box<dyn NADecoder + Send> {
     Box::new(TMRTDecoder::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]));
     }
 }