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

diff --git a/nihav-duck/src/codecs/truemotion2.rs b/nihav-duck/src/codecs/truemotion2.rs
index 8be4561..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;
@@ -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())
 }
@@ -590,14 +597,14 @@ mod test {
     use nihav_core::codecs::RegisteredDecoders;
     use nihav_core::demuxers::RegisteredDemuxers;
     use nihav_codec_support::test::dec_video::*;
-    use crate::duck_register_all_codecs;
+    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);
+        duck_register_all_decoders(&mut dec_reg);
 
         test_decoding("avi", "truemotion2", "assets/Duck/tm20.avi", Some(16),
                         &dmx_reg, &dec_reg, ExpectedTestResult::MD5Frames(vec![