X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-duck%2Fsrc%2Fcodecs%2Ftruemotion2.rs;h=09c9844ce45257151be5aae2cec27db9910b707c;hb=47933c6d7ef4dc3ca6d549199081c67cea324c36;hp=32fb73280a0d8d785c050efa4f29062319f5ac24;hpb=d24468d9dbd54f5cbe414649ff061699337fa7fe;p=nihav.git diff --git a/nihav-duck/src/codecs/truemotion2.rs b/nihav-duck/src/codecs/truemotion2.rs index 32fb732..09c9844 100644 --- a/nihav-duck/src/codecs/truemotion2.rs +++ b/nihav-duck/src/codecs/truemotion2.rs @@ -336,6 +336,7 @@ struct TM2Decoder { impl TM2Decoder { fn new() -> Self { Self::default() } + #[allow(clippy::manual_memcpy)] fn decode_blocks(&mut self) -> DecoderResult { 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 { None } +} + pub fn get_decoder() -> Box { Box::new(TM2Decoder::new()) } @@ -589,9 +596,9 @@ pub fn get_decoder() -> Box { 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_codecs; + use nihav_commonfmt::generic_register_all_demuxers; #[test] fn test_tm2() { let mut dmx_reg = RegisteredDemuxers::new();