X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-duck%2Fsrc%2Fcodecs%2Ftruemotion2.rs;h=32fb73280a0d8d785c050efa4f29062319f5ac24;hb=d24468d9dbd54f5cbe414649ff061699337fa7fe;hp=ecfce30837ba16088d4d71106ace65b62af61e93;hpb=8a7352c04dd848eea6519f0d775d98d547b90a39;p=nihav.git

diff --git a/nihav-duck/src/codecs/truemotion2.rs b/nihav-duck/src/codecs/truemotion2.rs
index ecfce30..32fb732 100644
--- a/nihav-duck/src/codecs/truemotion2.rs
+++ b/nihav-duck/src/codecs/truemotion2.rs
@@ -145,11 +145,11 @@ impl TM2Stream {
         validate!(pos <= endpos);
         let toskip = endpos - pos;
                                                   br.read_skip(toskip as usize)?;
-        
+
         Ok(())
     }
     fn read_deltas(&mut self, src: &[u8]) -> DecoderResult<usize> {
-        let mut br = BitReader::new(src, src.len(), BitReaderMode::LE32MSB);
+        let mut br = BitReader::new(src, BitReaderMode::LE32MSB);
         let coded_deltas                        = br.read(9)? as usize;
         let bits                                = br.read(5)? as u8;
         validate!((coded_deltas <= TM2_MAX_DELTAS) && (bits > 0));
@@ -164,11 +164,11 @@ impl TM2Stream {
                 self.deltas[i] = val as i32;
             }
         }
-        
+
         Ok(((br.tell() + 31) >> 5) << 2)
     }
     fn read_huff_tree(&mut self, src: &[u8], htree: &mut HuffTree) -> DecoderResult<usize> {
-        let mut br = BitReader::new(src, src.len(), BitReaderMode::LE32MSB);
+        let mut br = BitReader::new(src, BitReaderMode::LE32MSB);
 
         let val_bits                            = br.read(5)? as u8;
         let max_bits                            = br.read(5)? as u8;
@@ -186,11 +186,11 @@ impl TM2Stream {
             let mut cr = FullCodebookDescReader::new(codes);
             htree.cb = Some(Codebook::new(&mut cr, CodebookMode::MSB)?);
         }
-        
+
         Ok(((br.tell() + 31) >> 5) << 2)
     }
     fn read_tokens(&mut self, src: &[u8], htree: &HuffTree, ntoks: usize) -> DecoderResult<usize> {
-        let mut br = BitReader::new(src, src.len(), BitReaderMode::LE32MSB);
+        let mut br = BitReader::new(src, BitReaderMode::LE32MSB);
 
         if let Some(ref cb) = htree.cb {
             for _ in 0..ntoks {
@@ -198,7 +198,7 @@ impl TM2Stream {
                 self.tokens.push(tok);
             }
         }
-        
+
         Ok(((br.tell() + 31) >> 5) << 2)
     }
 
@@ -577,9 +577,11 @@ impl NADecoder for TM2Decoder {
         frm.set_frame_type(if 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(TM2Decoder::new())
 }
 
@@ -597,6 +599,24 @@ mod test {
         let mut dec_reg = RegisteredDecoders::new();
         duck_register_all_codecs(&mut dec_reg);
 
-        test_file_decoding("avi", "assets/Duck/tm20.avi", Some(16), true, false, None/*Some("tm2")*/, &dmx_reg, &dec_reg);
+        test_decoding("avi", "truemotion2", "assets/Duck/tm20.avi", Some(16),
+                        &dmx_reg, &dec_reg, ExpectedTestResult::MD5Frames(vec![
+                            [0x8c336eb4, 0x10d0d934, 0x52392306, 0xc0bc6dd3],
+                            [0xf168ddc2, 0x502fef17, 0xf7a5d0a2, 0xc0bf2d26],
+                            [0xf33e02fa, 0x3931b691, 0xb29a0754, 0x07c0f8fa],
+                            [0x2dd81034, 0x1c9f7616, 0x64eed48a, 0x3aa09cf0],
+                            [0x55d18cd9, 0x0a3fd971, 0xf28fd5af, 0x9d9c3e3d],
+                            [0xbf9cbbd8, 0x7b44c122, 0x1c7b1904, 0x77cc87aa],
+                            [0xa6f6e79d, 0xc463a5bc, 0x5df9460c, 0xfce2e352],
+                            [0x2ad22b2d, 0xd4ceaff8, 0xa4adb974, 0x37888a8d],
+                            [0x4d45575f, 0x7e5b7670, 0x40cb7438, 0x9872d422],
+                            [0xb35bc12b, 0x026c77c6, 0x93163784, 0xb37630b7],
+                            [0xb1ec5059, 0x1fe26596, 0x4ac8d214, 0xdaf1b895],
+                            [0x69dd5a5f, 0xe14a16fa, 0xa0653092, 0xb04e0739],
+                            [0x979d8fe1, 0xbef29f89, 0xefae5f86, 0xa1ceb7d2],
+                            [0xc6dc80d7, 0x80153c6b, 0x76d770c0, 0x8fd7cce7],
+                            [0x8da96394, 0x1bd68024, 0x5feddfba, 0xd2b00660],
+                            [0x53ff97c3, 0xc021a9b3, 0xabdddc10, 0xc99ab86f],
+                            [0x66c877c4, 0xd8358048, 0xbca593db, 0xc6ecc4d1]]));
     }
 }