let cfdt = DUCK_C_FAT_DELTAS[delta_set];
let vec = DUCK_VECTABLES[table_idx - 1];
- let mut vec_iter = vec.into_iter();
+ let mut vec_iter = vec.iter();
for i in 0..256 {
let len = (*vec_iter.next().unwrap() as usize) >> 1;
for j in 0..len {
_ => unreachable!(),
};
} else {
- let cur = (dst[off + x + 0] as u32) | ((dst[off + x + 1] as u32) << 16);
+ let cur = u32::from(dst[off + x + 0]) | (u32::from(dst[off + x + 1]) << 16);
self.vert_pred[(x >> 1) + 0] = cur;
- let cur = (dst[off + x + 2] as u32) | ((dst[off + x + 3] as u32) << 16);
+ let cur = u32::from(dst[off + x + 2]) | (u32::from(dst[off + x + 3]) << 16);
hor_pred = cur.wrapping_sub(self.vert_pred[(x >> 1) + 1]);
self.vert_pred[(x >> 1) + 1] = cur;
}
_ => unreachable!(),
};
} else {
- let cur = (dst[off + x*4 + 0] as u32)
- | ((dst[off + x*4 + 1] as u32) << 8)
- | ((dst[off + x*4 + 2] as u32) << 16)
- | ((dst[off + x*4 + 3] as u32) << 24);
+ let cur = u32::from(dst[off + x*4 + 0])
+ | (u32::from(dst[off + x*4 + 1]) << 8)
+ | (u32::from(dst[off + x*4 + 2]) << 16)
+ | (u32::from(dst[off + x*4 + 3]) << 24);
self.vert_pred[x + 0] = cur;
- let cur = (dst[off + x*4 + 4] as u32)
- | ((dst[off + x*4 + 5] as u32) << 8)
- | ((dst[off + x*4 + 6] as u32) << 16)
- | ((dst[off + x*4 + 7] as u32) << 24);
+ let cur = u32::from(dst[off + x*4 + 4])
+ | (u32::from(dst[off + x*4 + 5]) << 8)
+ | (u32::from(dst[off + x*4 + 6]) << 16)
+ | (u32::from(dst[off + x*4 + 7]) << 24);
hor_pred = cur.wrapping_sub(self.vert_pred[x + 1]);
self.vert_pred[x + 1] = cur;
}
}
impl NADecoder for TM1Decoder {
- fn init(&mut self, info: NACodecInfoRef) -> 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.info = NACodecInfo::new_ref(info.get_name(), myinfo, info.get_extradata()).into_ref();
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() > 10);
let hdr_size = (src[0].rotate_left(3) & 0x7F) as usize;
let mask_bits = &src[hdr_size..][..mask_size];
let index_bytes = &src[hdr_size+mask_size..];
validate!(src.len() >= hdr_size + mask_size);
- self.vert_pred.truncate(0);
+ self.vert_pred.clear();
self.vert_pred.resize(out_width, 0);
if is_intra || is_sprite {
let fmt = if is_24bit { BGR0_FORMAT } else { RGB555_FORMAT };
let myinfo = NAVideoInfo::new(out_width, height, false, fmt);
- let bufret = alloc_video_buffer(myinfo, 2);
- if let Err(_) = bufret { return Err(DecoderError::InvalidData); }
- let bufinfo = bufret.unwrap();
+ let bufinfo = alloc_video_buffer(myinfo, 2)?;
self.lastframe.reset();
if !is_24bit {
self.lastframe.set16(bufinfo.get_vbuf16().unwrap());
} else {
return Err(DecoderError::MissingReference);
}
- } else {
- if let Some(mut buf) = self.lastframe.get24() {
- let stride = buf.get_stride(0);
- {
- let data = buf.get_data_mut().unwrap();
- self.decode_24bit(data.as_mut_slice(), stride, out_width, height, &mut mask, &mut index)?;
- }
- bufinfo = NABufferType::VideoPacked(buf);
- } else {
- return Err(DecoderError::MissingReference);
+ } else if let Some(mut buf) = self.lastframe.get24() {
+ let stride = buf.get_stride(0);
+ {
+ let data = buf.get_data_mut().unwrap();
+ self.decode_24bit(data.as_mut_slice(), stride, out_width, height, &mut mask, &mut index)?;
}
+ bufinfo = NABufferType::VideoPacked(buf);
+ } else {
+ return Err(DecoderError::MissingReference);
}
let mut frm = NAFrame::new_from_pkt(pkt, self.info.clone(), bufinfo);
frm.set_frame_type(if is_intra { FrameType::I } else { FrameType::P });
Ok(frm.into_ref())
}
+ fn flush(&mut self) {
+ self.lastframe.reset();
+ }
+}
+
+impl NAOptionHandler for TM1Decoder {
+ 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(TM1Decoder::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_tm1() {
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", "truemotion1", "assets/Duck/phant2-940.duk", Some(12), &dmx_reg, &dec_reg,
+ ExpectedTestResult::MD5Frames(vec![
+ [0x989e62b8, 0x5d85c23c, 0x1cffba6d, 0xe599f1c4],
+ [0xc4231321, 0x25561487, 0x9db11f57, 0x4faeb9a5],
+ [0x36e3a831, 0xdbd21f89, 0x0a446071, 0xf6d31ee7],
+ [0x0af640af, 0x64bc2bac, 0x0e95dd72, 0x9e55360b],
+ [0xbc9c5f8b, 0x6c06f2bc, 0x216f4129, 0x3a421337],
+ [0xd8ea7297, 0xce5f79fc, 0x46071f4c, 0xaed7fb7a],
+ [0x87617060, 0x72ce8df8, 0xde42eaa6, 0x804a6f45],
+ [0xfd8c45b3, 0xf424b683, 0xb4d6a9bd, 0xc622d0b9],
+ [0x6c233746, 0xba8ed68e, 0xc0ed0e85, 0xc99e1dc0],
+ [0x5842aac0, 0xd3d78242, 0x5da21218, 0xea1ed0ad],
+ [0xdea0db20, 0xe2ce3586, 0xf7386649, 0xecc374f9],
+ [0xb80ae9cb, 0x04eb938e, 0xd8a337ee, 0x0054b5ed],
+ [0xf8b80e1d, 0xd8eb3d6c, 0xa99b23ff, 0x562851a1]]));
+ test_decoding("avi", "truemotion1", "assets/Duck/SPRITES.AVI", Some(2), &dmx_reg, &dec_reg,
+ ExpectedTestResult::MD5([0xb89a4275, 0xf9797f5f, 0xe53c1ccd, 0xfa163e02]));
//let file = "assets/Duck/AVI-DUCK-dk3.duk";
- let file = "assets/Duck/phant2-940.duk";
+ //let file = "assets/Duck/phant2-940.duk";
//let file = "assets/Duck/bugsampler-m01-16bit.avi";
//let file = "assets/Duck/sonic3dblast_intro.avi";
//let file = "assets/Duck/BUTTONS.AVI";
//let file = "assets/Duck/SPRITES.AVI";
//let file = "assets/Duck/TRICORD.AVI";
- test_file_decoding("avi", file, Some(42), true, false, None/*Some("tm1-")*/, &dmx_reg, &dec_reg);
+ //test_file_decoding("avi", file, Some(42), true, false, None/*Some("tm1-")*/, &dmx_reg, &dec_reg);
}
}
projects / nihav.git / blobdiff