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)
}
dc: [[i32; 2]; 2],
}
+#[allow(clippy::erasing_op)]
impl DeltaState {
fn apply_y(&mut self, dst: &mut [u8], mut yoff: usize, ystride: usize, ydeltas: &[i32; 16], last: &mut [i32]) {
for y in 0..4 {
}
fn recalc_y(&mut self, dst: &[u8], yoff: usize, ystride: usize, last: &mut [i32]) {
let src = &dst[yoff+3..];
- self.dy[0] = (src[ystride * 0] as i32) - last[3];
- self.dy[1] = (src[ystride * 1] as i32) - (src[ystride * 0] as i32);
- self.dy[2] = (src[ystride * 2] as i32) - (src[ystride * 1] as i32);
- self.dy[3] = (src[ystride * 3] as i32) - (src[ystride * 2] as i32);
+ self.dy[0] = i32::from(src[ystride * 0]) - last[3];
+ self.dy[1] = i32::from(src[ystride * 1]) - i32::from(src[ystride * 0]);
+ self.dy[2] = i32::from(src[ystride * 2]) - i32::from(src[ystride * 1]);
+ self.dy[3] = i32::from(src[ystride * 3]) - i32::from(src[ystride * 2]);
let src = &dst[yoff + 3 * ystride..];
for x in 0..4 {
- last[x] = src[x] as i32;
+ last[x] = i32::from(src[x]);
}
}
fn recalc_c(&mut self, dst: &[i16], coff: usize, cstride: usize, idx: usize, last: &mut [i32]) {
- self.dc[idx][0] = (dst[coff + 1] as i32) - last[1];
- self.dc[idx][1] = (dst[coff + 1 + cstride] as i32) - (dst[coff + 1] as i32);
- last[0] = dst[coff + cstride + 0] as i32;
- last[1] = dst[coff + cstride + 1] as i32;
+ self.dc[idx][0] = i32::from(dst[coff + 1]) - last[1];
+ self.dc[idx][1] = i32::from(dst[coff + 1 + cstride]) - i32::from(dst[coff + 1]);
+ last[0] = i32::from(dst[coff + cstride + 0]);
+ last[1] = i32::from(dst[coff + cstride + 1]);
}
}
fn alloc(width: usize, height: usize) -> Self {
let ystride = (width + 3) & !3;
let ysize = ystride * ((height + 3) & !3);
- let mut ydata = Vec::with_capacity(ysize);
- ydata.resize(ysize, 0);
let cstride = ystride >> 1;
let csize = cstride * (((height + 3) & !3) >> 1);
- let mut udata = Vec::with_capacity(csize);
- udata.resize(csize, 0);
- let mut vdata = Vec::with_capacity(csize);
- vdata.resize(csize, 0);
- Self { ydata, udata, vdata, ystride, cstride }
+ Self { ydata: vec![0; ysize], udata: vec![0; csize], vdata: vec![0; csize], ystride, cstride }
}
}
#[derive(Default)]
struct TM2Decoder {
- info: Rc<NACodecInfo>,
+ info: NACodecInfoRef,
streams: [TM2Stream; TM2StreamType::Num as usize],
width: usize,
height: usize,
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;
let mut ydeltas: [i32; 16] = [0; 16];
let mut cdeltas: [[i32; 4]; 2] = [[0; 4]; 2];
- let mut lasty: Vec<i32> = Vec::with_capacity(self.width + 1);
- lasty.resize(self.width + 1, 0);
- let mut lastu: Vec<i32> = Vec::with_capacity(self.width/2 + 1);
- lastu.resize(self.width/2 + 1, 0);
- let mut lastv: Vec<i32> = Vec::with_capacity(self.width/2 + 1);
- lastv.resize(self.width/2 + 1, 0);
+ let mut lasty: Vec<i32> = vec![0; self.width + 1];
+ let mut lastu: Vec<i32> = vec![0; self.width/2 + 1];
+ let mut lastv: Vec<i32> = vec![0; self.width/2 + 1];
for by in 0..bh {
let mut dstate = DeltaState::default();
for bx in 0..bw {
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;
}
fmt.get_chromaton(1).unwrap().get_offset() as usize,
fmt.get_chromaton(2).unwrap().get_offset() as usize];
let stride = buf.get_stride(0);
- let mut data = buf.get_data_mut();
+ let data = buf.get_data_mut().unwrap();
let dst = data.as_mut_slice();
let mut off = 0;
for y in 0..self.height {
let out = &mut dst[off..];
for (x, pic) in out.chunks_exact_mut(3).take(self.width).enumerate() {
- let y = self.cur_frame.ydata[ysrc + x] as i16;
+ let y = i16::from(self.cur_frame.ydata[ysrc + x]);
let u = self.cur_frame.udata[csrc + (x >> 1)];
let v = self.cur_frame.vdata[csrc + (x >> 1)];
pic[offs[0]] = (y + u).max(0).min(255) as u8;
}
impl NADecoder for TM2Decoder {
- fn init(&mut self, info: Rc<NACodecInfo>) -> DecoderResult<()> {
+ fn init(&mut self, _supp: &mut NADecoderSupport, info: NACodecInfoRef) -> DecoderResult<()> {
if let NACodecTypeInfo::Video(vinfo) = info.get_properties() {
let myinfo = NACodecTypeInfo::Video(NAVideoInfo::new(vinfo.get_width(), vinfo.get_height(), false, YUV410_FORMAT));
self.width = vinfo.get_width();
self.height = vinfo.get_height();
self.cur_frame = TM2Frame::alloc(self.width, self.height);
self.prev_frame = TM2Frame::alloc(self.width, self.height);
- self.info = Rc::new(NACodecInfo::new_ref(info.get_name(), myinfo, info.get_extradata()));
+ self.info = NACodecInfo::new_ref(info.get_name(), myinfo, info.get_extradata()).into_ref();
Ok(())
} else {
Err(DecoderError::InvalidData)
}
}
- fn decode(&mut self, pkt: &NAPacket) -> DecoderResult<NAFrameRef> {
+ fn decode(&mut self, _supp: &mut NADecoderSupport, pkt: &NAPacket) -> DecoderResult<NAFrameRef> {
let src = pkt.get_buffer();
validate!(src.len() >= 40 + (TM2StreamType::Num as usize) * 4 + 4);
let mut mr = MemoryReader::new_read(&src);
}
let myinfo = NAVideoInfo::new(self.width, self.height, false, RGB24_FORMAT);
- let bufret = alloc_video_buffer(myinfo, 2);
- if let Err(_) = bufret { return Err(DecoderError::InvalidData); }
- let mut bufinfo = bufret.unwrap();
+ let bufinfo = alloc_video_buffer(myinfo, 2)?;
let mut buf = bufinfo.get_vbuf().unwrap();
let is_intra = self.decode_blocks()?;
let mut frm = NAFrame::new_from_pkt(pkt, self.info.clone(), bufinfo);
frm.set_keyframe(is_intra);
frm.set_frame_type(if is_intra { FrameType::I } else { FrameType::P });
- Ok(Rc::new(RefCell::new(frm)))
+ Ok(frm.into_ref())
}
+ fn flush(&mut self) {
+ }
+}
+
+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<NADecoder> {
+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);
-
- 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]]));
}
}
projects / nihav.git / blobdiff