struct CinepakDecoder {
info: NACodecInfoRef,
- frmmgr: HAMShuffler,
- cb_v1: [[u8; 6]; 256],
- cb_v4: [[u8; 6]; 256],
+ frmmgr: HAMShuffler<u8>,
+ cb_v1: Vec<[[u8; 6]; 256]>,
+ cb_v4: Vec<[[u8; 6]; 256]>,
mode: DecodeMode,
}
CinepakDecoder {
info: NACodecInfo::new_dummy(),
frmmgr: HAMShuffler::new(),
- cb_v1: [[0; 6]; 256],
- cb_v4: [[0; 6]; 256],
+ cb_v1: Vec::with_capacity(1),
+ cb_v4: Vec::with_capacity(1),
mode: DecodeMode::Unknown,
}
}
validate!(br.tell() == end);
Ok(())
}
- fn decode_strip(&mut self, src: &[u8], is_intra: bool, is_intra_strip: bool, xoff: usize, yoff: usize, xend: usize, yend: usize, frm: &mut NASimpleVideoFrame<u8>) -> DecoderResult<()> {
+ fn decode_strip(&mut self, src: &[u8], sno: usize, is_intra: bool, is_intra_strip: bool, xoff: usize, yoff: usize, xend: usize, yend: usize, frm: &mut NASimpleVideoFrame<u8>) -> DecoderResult<()> {
let mut mr = MemoryReader::new_read(src);
let mut br = ByteReader::new(&mut mr);
let mut idx_pos = 0;
let mut idx_size = 0;
let mut v1_only = false;
+ let mut intra_mode = true;
while br.left() > 0 {
let id = br.read_byte()?;
- if (id & 0xF0) == 0x20 {
- validate!(((id & 1) != 0) ^ is_intra_strip);
+ if (id & 0xF0) == 0x20 && is_intra_strip {
+ validate!((id & 1) == 0);
}
let size = br.read_u24be()? as usize;
validate!(size >= 4 && (size - 4 <= (br.left() as usize)));
match id {
- 0x20 => Self::read_cb (&mut br, size, &mut self.cb_v4, true)?,
- 0x21 => Self::read_cb_upd(&mut br, size, &mut self.cb_v4, true)?,
- 0x22 => Self::read_cb (&mut br, size, &mut self.cb_v1, true)?,
- 0x23 => Self::read_cb_upd(&mut br, size, &mut self.cb_v1, true)?,
- 0x24 => Self::read_cb (&mut br, size, &mut self.cb_v4, false)?,
- 0x25 => Self::read_cb_upd(&mut br, size, &mut self.cb_v4, false)?,
- 0x26 => Self::read_cb (&mut br, size, &mut self.cb_v1, false)?,
- 0x27 => Self::read_cb_upd(&mut br, size, &mut self.cb_v1, false)?,
+ 0x20 => Self::read_cb (&mut br, size, &mut self.cb_v4[sno], true)?,
+ 0x21 => Self::read_cb_upd(&mut br, size, &mut self.cb_v4[sno], true)?,
+ 0x22 => Self::read_cb (&mut br, size, &mut self.cb_v1[sno], true)?,
+ 0x23 => Self::read_cb_upd(&mut br, size, &mut self.cb_v1[sno], true)?,
+ 0x24 => Self::read_cb (&mut br, size, &mut self.cb_v4[sno], false)?,
+ 0x25 => Self::read_cb_upd(&mut br, size, &mut self.cb_v4[sno], false)?,
+ 0x26 => Self::read_cb (&mut br, size, &mut self.cb_v1[sno], false)?,
+ 0x27 => Self::read_cb_upd(&mut br, size, &mut self.cb_v1[sno], false)?,
0x30 => { // intra indices
validate!(idx_pos == 0);
idx_pos = br.tell() as usize;
0x31 => { // inter indices
validate!(!is_intra);
validate!(idx_pos == 0);
+ intra_mode = false;
idx_pos = br.tell() as usize;
idx_size = size - 4;
br.read_skip(idx_size)?;
let mut y = yoff;
let mut block = [0u8; 24];
while br.left() > 0 {
- let flags = if !v1_only { br.read_u32be()? } else { 0xFFFFFFFF };
+ let mut flags = if !v1_only { br.read_u32be()? } else { 0x00000000 };
let mut mask = 1 << 31;
while mask > 0 {
- if !is_intra {
+ if !intra_mode {
let skip = (flags & mask) == 0;
mask >>= 1;
if skip {
return Ok(());
}
}
+ continue;
+ }
+ if mask == 0 {
+ flags = br.read_u32be()?;
+ mask = 1 << 31;
}
- continue;
}
if (flags & mask) == 0 {
let idx = br.read_byte()? as usize;
- let cb = &self.cb_v1[idx];
+ let cb = &self.cb_v1[sno][idx];
block[ 0] = cb[0]; block[ 1] = cb[0]; block[ 2] = cb[1]; block[ 3] = cb[1];
block[ 4] = cb[0]; block[ 5] = cb[0]; block[ 6] = cb[1]; block[ 7] = cb[1];
block[ 8] = cb[2]; block[ 9] = cb[2]; block[10] = cb[3]; block[11] = cb[3];
block[22] = cb[5]; block[23] = cb[5];
} else {
let idx0 = br.read_byte()? as usize;
- let cb0 = &self.cb_v4[idx0];
+ let cb0 = &self.cb_v4[sno][idx0];
let idx1 = br.read_byte()? as usize;
- let cb1 = &self.cb_v4[idx1];
+ let cb1 = &self.cb_v4[sno][idx1];
let idx2 = br.read_byte()? as usize;
- let cb2 = &self.cb_v4[idx2];
+ let cb2 = &self.cb_v4[sno][idx2];
let idx3 = br.read_byte()? as usize;
- let cb3 = &self.cb_v4[idx3];
+ let cb3 = &self.cb_v4[sno][idx3];
block[ 0] = cb0[0]; block[ 1] = cb0[1]; block[ 2] = cb1[0]; block[ 3] = cb1[1];
block[ 4] = cb0[2]; block[ 5] = cb0[3]; block[ 6] = cb1[2]; block[ 7] = cb1[3];
block[ 8] = cb2[0]; block[ 9] = cb2[1]; block[10] = cb3[0]; block[11] = cb3[1];
_ => {},
};
}
+ self.cb_v1.resize(nstrips, [[0; 6]; 256]);
+ self.cb_v4.resize(nstrips, [[0; 6]; 256]);
if let Some(ref vinfo) = self.info.get_properties().get_video_info() {
if vinfo.width != width || vinfo.height != height || self.mode != mode {
let start = br.tell() as usize;
let end = start + size - 12;
let strip_data = &src[start..end];
- self.decode_strip(strip_data, is_intra, is_intra_strip, 0, last_y, xend, last_y + yend, &mut frm)?;
+ if is_intra && i > 0 {
+ self.cb_v1[i] = self.cb_v1[i - 1];
+ self.cb_v4[i] = self.cb_v4[i - 1];
+ }
+ self.decode_strip(strip_data, i, is_intra, is_intra_strip, 0, last_y, xend, last_y + yend, &mut frm)?;
br.read_skip(size - 12)?;
last_y += yend;
}
use nihav_core::codecs::RegisteredDecoders;
use nihav_core::demuxers::RegisteredDemuxers;
use nihav_codec_support::test::dec_video::*;
- use crate::generic_register_all_codecs;
+ use crate::generic_register_all_decoders;
use crate::generic_register_all_demuxers;
#[test]
fn test_cinepak() {
let mut dmx_reg = RegisteredDemuxers::new();
generic_register_all_demuxers(&mut dmx_reg);
let mut dec_reg = RegisteredDecoders::new();
- generic_register_all_codecs(&mut dec_reg);
+ generic_register_all_decoders(&mut dec_reg);
+ // sample: https://samples.mplayerhq.hu/V-codecs/CVID/ot171.avi
test_decoding("avi", "cinepak", "assets/Misc/ot171.avi", Some(10), &dmx_reg,
&dec_reg, ExpectedTestResult::MD5Frames(vec![
[0xd58326b0, 0xdbfc1dcc, 0x6d66a04c, 0x08a21bbb],
let mut dmx_reg = RegisteredDemuxers::new();
generic_register_all_demuxers(&mut dmx_reg);
let mut dec_reg = RegisteredDecoders::new();
- generic_register_all_codecs(&mut dec_reg);
+ generic_register_all_decoders(&mut dec_reg);
+ // sample: https://samples.mplayerhq.hu/V-codecs/CVID/grayscale/dday.mov
test_decoding("mov", "cinepak", "assets/Misc/dday.mov", Some(10), &dmx_reg,
&dec_reg, ExpectedTestResult::MD5Frames(vec![
[0x2ab229bc, 0xb71308aa, 0x979511c6, 0xcef3ea92],
- [0x2ab229bc, 0xb71308aa, 0x979511c6, 0xcef3ea92],
- [0x2ab229bc, 0xb71308aa, 0x979511c6, 0xcef3ea92],
- [0x2ab229bc, 0xb71308aa, 0x979511c6, 0xcef3ea92],
- [0x2ab229bc, 0xb71308aa, 0x979511c6, 0xcef3ea92],
- [0x2ab229bc, 0xb71308aa, 0x979511c6, 0xcef3ea92],
- [0x2ab229bc, 0xb71308aa, 0x979511c6, 0xcef3ea92],
- [0x2ab229bc, 0xb71308aa, 0x979511c6, 0xcef3ea92],
- [0x2ab229bc, 0xb71308aa, 0x979511c6, 0xcef3ea92],
- [0x2ab229bc, 0xb71308aa, 0x979511c6, 0xcef3ea92],
+ [0x94f227d5, 0xbaa646ef, 0xab78f751, 0x8e1f50da],
+ [0x555de93a, 0x625e77f0, 0x95611bae, 0xbd715e9d],
+ [0xb31b9ba7, 0xba6327f8, 0x5698954f, 0xc16fad2a],
+ [0xda86ffb6, 0x58deb79d, 0x59f62c5b, 0x1bd2a2c5],
+ [0x2f46c7eb, 0x8950ac76, 0xbc68c470, 0x12e3247a],
+ [0x77d73950, 0xf76b28b0, 0x3552bb52, 0x38900a51],
+ [0xf4f45bef, 0x91146af2, 0xdcf4d44e, 0x713bf36e],
+ [0x8e06d350, 0x787f245e, 0x32426903, 0xf35f7dd3],
+ [0x0e35ebc1, 0xfdb6c520, 0x2bf484dc, 0xcec78b63],
[0xb8411fa4, 0x3a35f646, 0x85e8e04a, 0xfff58785]]));
}
#[test]
let mut dmx_reg = RegisteredDemuxers::new();
generic_register_all_demuxers(&mut dmx_reg);
let mut dec_reg = RegisteredDecoders::new();
- generic_register_all_codecs(&mut dec_reg);
+ generic_register_all_decoders(&mut dec_reg);
+ // sample: https://samples.mplayerhq.hu/V-codecs/CVID/palette/catfight%20Tag%20team%20DT.mov
test_decoding("mov", "cinepak", "assets/Misc/catfight Tag team DT.mov", Some(10), &dmx_reg,
&dec_reg, ExpectedTestResult::MD5Frames(vec![
[0x3f7ec8ea, 0x873a2bc6, 0xcc58336e, 0xe88c4ffd],
projects / nihav.git / blobdiff