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;
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));
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;
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 {
self.tokens.push(tok);
}
}
-
+
Ok(((br.tell() + 31) >> 5) << 2)
}
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;
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;
}
}
}
+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())
}
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);
+ 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],