X-Git-Url: https://git.nihav.org/?p=nihav.git;a=blobdiff_plain;f=nihav-duck%2Fsrc%2Fcodecs%2Ftruemotion2.rs;h=4020e732810833f9744103bd388dfb9e73d5ef87;hp=bf8aa7df364a7b5946e63ee96b3d44d298caf3a7;hb=HEAD;hpb=78fb6560c73965d834b215fb0b49505ae5443288 diff --git a/nihav-duck/src/codecs/truemotion2.rs b/nihav-duck/src/codecs/truemotion2.rs index bf8aa7d..4020e73 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; @@ -561,8 +561,8 @@ impl NADecoder for TM2Decoder { let magic = br.read_u32be()?; validate!(magic == 0x100 || magic == 0x101); br.read_skip(36)?; - for str in self.streams.iter_mut() { - str.read_header(&src, &mut br)?; + for stream in self.streams.iter_mut() { + stream.read_header(&src, &mut br)?; } let myinfo = NAVideoInfo::new(self.width, self.height, false, RGB24_FORMAT); @@ -606,6 +606,7 @@ mod test { let mut dec_reg = RegisteredDecoders::new(); duck_register_all_decoders(&mut dec_reg); + // sample: https://samples.mplayerhq.hu/V-codecs/TM20/tm20.avi test_decoding("avi", "truemotion2", "assets/Duck/tm20.avi", Some(16), &dmx_reg, &dec_reg, ExpectedTestResult::MD5Frames(vec![ [0x8c336eb4, 0x10d0d934, 0x52392306, 0xc0bc6dd3],