X-Git-Url: https://git.nihav.org/?p=nihav.git;a=blobdiff_plain;f=nihav-duck%2Fsrc%2Fcodecs%2Ftruemotionrt.rs;h=5ca17bd2ceb971e7278be241742b0448497e4bc0;hp=7119061288e1b1c14802c90d9ee81e690e90bfa2;hb=78fb6560c73965d834b215fb0b49505ae5443288;hpb=08a1fab72215ea7716f51adf7008f85372e80c71

diff --git a/nihav-duck/src/codecs/truemotionrt.rs b/nihav-duck/src/codecs/truemotionrt.rs
index 7119061..5ca17bd 100644
--- a/nihav-duck/src/codecs/truemotionrt.rs
+++ b/nihav-duck/src/codecs/truemotionrt.rs
@@ -14,6 +14,7 @@ const TMRT_DELTA_TAB: [&[i16]; 3] = [
 
 impl TMRTDecoder {
     fn new() -> Self { Self::default() }
+    #[allow(clippy::too_many_arguments)]
     fn decode_plane(&self, br: &mut BitReader, dst: &mut [u8], mut off: usize, stride: usize, w: usize, h: usize, hscale: bool, dbits: u8, is_chroma: bool) -> DecoderResult<()> {
         let delta_tab = TMRT_DELTA_TAB[(dbits - 2) as usize];
         let step = if !hscale { 1 } else { 2 };
@@ -63,7 +64,7 @@ impl NADecoder for TMRTDecoder {
         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 {
@@ -84,6 +85,12 @@ impl NADecoder for TMRTDecoder {
     }
 }
 
+impl NAOptionHandler for TMRTDecoder {
+    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(TMRTDecoder::new())
 }
@@ -92,16 +99,18 @@ pub fn get_decoder() -> Box<dyn NADecoder + Send> {
 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_tmrt() {
         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_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]));
     }
 }