X-Git-Url: https://git.nihav.org/?p=nihav.git;a=blobdiff_plain;f=nihav-duck%2Fsrc%2Fcodecs%2Ftruemotion2.rs;h=0c9e0041db0f96a62d938348a2bca08d31338f9a;hp=d6b4732402c297590e470f79d183cefc4a7aab06;hb=379524159c95f1c3639976ccf35f9d47cd9732ac;hpb=08a1fab72215ea7716f51adf7008f85372e80c71

diff --git a/nihav-duck/src/codecs/truemotion2.rs b/nihav-duck/src/codecs/truemotion2.rs
index d6b4732..0c9e004 100644
--- a/nihav-duck/src/codecs/truemotion2.rs
+++ b/nihav-duck/src/codecs/truemotion2.rs
@@ -102,7 +102,7 @@ impl Default for TM2Stream {
 
 impl TM2Stream {
     fn read_header(&mut self, src: &[u8], br: &mut ByteReader) -> DecoderResult<()> {
-        self.tokens.truncate(0);
+        self.tokens.clear();
         self.pos = 0;
 
         let len                                 = br.read_u32le()? as usize;
@@ -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)
     }
 
@@ -336,6 +336,7 @@ struct TM2Decoder {
 
 impl TM2Decoder {
     fn new() -> Self { Self::default() }
+    #[allow(clippy::manual_memcpy)]
     fn decode_blocks(&mut self) -> DecoderResult<bool> {
         let ydst = &mut self.cur_frame.ydata;
         let udst = &mut self.cur_frame.udata;
@@ -434,7 +435,7 @@ impl TM2Decoder {
                         for _ in 0..4 {
                             for x in 0..4 {
                                 let dy = self.streams[TM2StreamType::Update as usize].get_token()?;
-                                ydst[yoff + x] = ((ysrc[yoff + x] as i32) + dy) as u8;
+                                ydst[yoff + x] = (i32::from(ysrc[yoff + x]) + dy) as u8;
                             }
                             yoff += ystride;
                         }
@@ -581,6 +582,12 @@ impl NADecoder for TM2Decoder {
     }
 }
 
+impl NAOptionHandler for TM2Decoder {
+    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(TM2Decoder::new())
 }
@@ -589,16 +596,34 @@ 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_tm2() {
         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);
-
-        test_file_decoding("avi", "assets/Duck/tm20.avi", Some(16), true, false, None/*Some("tm2")*/, &dmx_reg, &dec_reg);
+        duck_register_all_decoders(&mut 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]]));
     }
 }