X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-indeo%2Fsrc%2Fcodecs%2Findeo3.rs;h=6f20613035afe032be267fea462965bfc331b35b;hb=2890938d5fde1e6d3706e1480857f455815fd4dc;hp=7ab84c1471f52757a6f00448d202b07dcaafab43;hpb=7241e0940fe2f854ecb3a54f1d673d749a4bd943;p=nihav.git diff --git a/nihav-indeo/src/codecs/indeo3.rs b/nihav-indeo/src/codecs/indeo3.rs index 7ab84c1..6f20613 100644 --- a/nihav-indeo/src/codecs/indeo3.rs +++ b/nihav-indeo/src/codecs/indeo3.rs @@ -215,6 +215,7 @@ struct Indeo3Decoder { altquant: [u8; 16], vq_offset: u8, bufs: Buffers, + requant_tab: [[u8; 128]; 8], } #[derive(Clone,Copy)] @@ -282,10 +283,32 @@ const SKIP_OR_TREE: u8 = 2; impl Indeo3Decoder { fn new() -> Self { + const REQUANT_OFF: [i32; 8] = [ 0, 1, 0, 4, 4, 1, 0, 1 ]; + let dummy_info = NACodecInfo::new_dummy(); + + let mut requant_tab = [[0u8; 128]; 8]; + for i in 0..8 { + let step = (i as i32) + 2; + let start = if (i == 3) || (i == 4) { -3 } else { step / 2 }; + let mut last = 0; + for j in 0..128 { + requant_tab[i][j] = (((j as i32) + start) / step * step + REQUANT_OFF[i]) as u8; + if requant_tab[i][j] < 128 { + last = requant_tab[i][j]; + } else { + requant_tab[i][j] = last; + } + } + } + requant_tab[1][7] = 10; + requant_tab[1][119] = 118; + requant_tab[1][120] = 118; + requant_tab[4][8] = 10; + Indeo3Decoder { info: dummy_info, bpos: 0, bbuf: 0, width: 0, height: 0, mvs: Vec::new(), altquant: [0; 16], - vq_offset: 0, bufs: Buffers::new() } + vq_offset: 0, bufs: Buffers::new(), requant_tab } } fn br_reset(&mut self) { @@ -303,7 +326,7 @@ impl Indeo3Decoder { } fn decode_cell_data(&mut self, br: &mut ByteReader, cell: IV3Cell, - off: usize, stride: usize, params: CellDecParams) -> DecoderResult<()> { + off: usize, stride: usize, params: CellDecParams, vq_idx: u8) -> DecoderResult<()> { let blk_w = cell.w * 4 / params.bw; let blk_h = cell.h * 4 / params.bh; let scale: usize = if params.bh == 4 { 1 } else { 2 }; @@ -315,6 +338,7 @@ impl Indeo3Decoder { let mut didx: usize = ((cell.x*4) as usize) + ((cell.y * 4) as usize) * stride + off; let mut sidx: usize; + if cell.no_mv() { sidx = 0; } else { @@ -331,6 +355,20 @@ impl Indeo3Decoder { validate!(b <= (self.height as i16)); sidx = (l as usize) + (t as usize) * stride + off; } + if vq_idx >= 8 { + let requant_tab = &self.requant_tab[(vq_idx & 7) as usize]; + if cell.no_mv() { + if cell.y > 0 { + for x in 0..(cell.w as usize) * 4 { + self.bufs.dbuf[didx + x - stride] = requant_tab[self.bufs.dbuf[didx + x - stride] as usize]; + } + } + } else { + for x in 0..(cell.w as usize) * 4 { + self.bufs.sbuf[sidx + x] = requant_tab[self.bufs.sbuf[sidx + x] as usize]; + } + } + } for y in 0..blk_h { let mut xoff: usize = 0; for _ in 0..blk_w { @@ -366,7 +404,7 @@ impl Indeo3Decoder { let mut idx2; if (c as usize) < delta_tab.data.len()/2 { idx1 = br.read_byte()? as usize; - validate!(idx1 < delta_tab.data.len()); + validate!(idx1 < delta_tab.data.len() / 2); idx2 = c as usize; } else { let tmp = (c as usize) - delta_tab.data.len()/2; @@ -432,7 +470,7 @@ impl Indeo3Decoder { tocopy = nl as usize; } if do_copy { - if !(params.bw == 8 && cell.no_mv()) { + if !(params.bh == 8 && cell.no_mv()) { if !cell.no_mv() { self.bufs.copy_block(didx + xoff + line * scale * stride, sidx + xoff + line * scale * stride, @@ -495,10 +533,10 @@ impl Indeo3Decoder { let c = self.altquant[vq_idx as usize]; idx1 = (c >> 4) as usize; idx2 = (c & 0xF) as usize; + } else { + idx1 += self.vq_offset as usize; + idx2 += self.vq_offset as usize; } - - idx1 += self.vq_offset as usize; - idx2 += self.vq_offset as usize; validate!((idx1 < 24) && (idx2 < 24)); let mut cp = CellDecParams { @@ -540,7 +578,7 @@ impl Indeo3Decoder { } else { return Err(DecoderError::InvalidData); } - self.decode_cell_data(br, cell, off, stride, cp) + self.decode_cell_data(br, cell, off, stride, cp, vq_idx) } fn parse_tree(&mut self, br: &mut ByteReader, cell: IV3Cell, off: usize, @@ -603,10 +641,12 @@ impl Indeo3Decoder { self.mvs.push(MV{ x, y }); } - let shift = if planeno == 0 { 2 } else { 4 }; - let round = (1 << shift) - 1; - let cell = IV3Cell::new(((self.bufs.width + round) >> shift) as u16, - ((self.bufs.height + round) >> shift) as u16); + let (cellwidth, cellheight) = if planeno == 0 { + (self.bufs.width >> 2, self.bufs.height >> 2) + } else { + (((self.bufs.width >> 2) + 3) >> 2, ((self.bufs.height >> 2) + 3) >> 2) + }; + let cell = IV3Cell::new(cellwidth as u16, cellheight as u16); self.br_reset(); self.parse_tree(br, cell, offs, stride, if planeno > 0 { 10 } else { 40 }, true)?; validate!(br.tell() <= end); @@ -628,9 +668,12 @@ impl Indeo3Decoder { self.mvs.push(MV{ x, y }); } - let shift = if planeno == 0 { 2 } else { 4 }; - let cell = IV3Cell::new((self.bufs.width >> shift) as u16, - (self.bufs.height >> shift) as u16); + let (cellwidth, cellheight) = if planeno == 0 { + (self.bufs.width >> 2, self.bufs.height >> 2) + } else { + (((self.bufs.width >> 2) + 3) >> 2, ((self.bufs.height >> 2) + 3) >> 2) + }; + let cell = IV3Cell::new(cellwidth as u16, cellheight as u16); self.br_reset(); self.parse_tree(br, cell, offs, stride, if planeno > 0 { 10 } else { 40 }, false)?; validate!(br.tell() <= end); @@ -674,6 +717,12 @@ impl NADecoder for Indeo3Decoder { if ver != 32 { return Err(DecoderError::NotImplemented); } let flags = br.read_u16le()?; let size2 = br.read_u32le()?; + if size2 == 0x80 { + let mut frm = NAFrame::new_from_pkt(pkt, self.info.clone(), NABufferType::None); + frm.set_keyframe(false); + frm.set_frame_type(FrameType::Skip); + return Ok(frm.into_ref()); + } validate!(((size2 + 7) >> 3) <= size); let cb = br.read_byte()?; self.vq_offset = cb; @@ -723,12 +772,12 @@ impl NADecoder for Indeo3Decoder { let vendpos = data_start + u64::from(vend); if intraframe { self.decode_plane_intra(&mut br, 0, ystart, yendpos)?; - self.decode_plane_intra(&mut br, 1, ustart, uendpos)?; - self.decode_plane_intra(&mut br, 2, vstart, vendpos)?; + self.decode_plane_intra(&mut br, 1, vstart, vendpos)?; + self.decode_plane_intra(&mut br, 2, ustart, uendpos)?; } else { self.decode_plane_inter(&mut br, 0, ystart, yendpos)?; - self.decode_plane_inter(&mut br, 1, ustart, uendpos)?; - self.decode_plane_inter(&mut br, 2, vstart, vendpos)?; + self.decode_plane_inter(&mut br, 1, vstart, vendpos)?; + self.decode_plane_inter(&mut br, 2, ustart, uendpos)?; } self.bufs.fill_framebuf(&mut buf); if (flags & FLAG_NONREF) == 0 { self.bufs.flip(); } @@ -760,7 +809,19 @@ mod test { let mut dec_reg = RegisteredDecoders::new(); indeo_register_all_codecs(&mut dec_reg); - test_file_decoding("avi", "assets/Indeo/iv32_example.avi", Some(10), true, false, None, &dmx_reg, &dec_reg); + test_decoding("avi", "indeo3", "assets/Indeo/iv32_example.avi", Some(10), + &dmx_reg, &dec_reg, ExpectedTestResult::MD5Frames(vec![ + [0x90be698e, 0x326db071, 0x08e8c6a5, 0x39349acc], + [0x25d677fc, 0x63f96aaa, 0xd412ca98, 0x61416313], + [0xc4368250, 0x63e7b6bc, 0xffcff950, 0x11f13239], + [0x7e869758, 0x027abc2e, 0x25204bca, 0x93fbaa03], + [0x5a1e822c, 0x2b1a4cd5, 0x72059843, 0xe5689ad1], + [0x3a971cce, 0x5ec22135, 0x1a45f802, 0x0f5f9264], + [0x0a65f782, 0xd8767cf3, 0x878b4b8d, 0xfc94c88b], + [0x4ac70139, 0x3300eac1, 0xba84b068, 0x47f5ff29], + [0x3e8c8ec4, 0x9421b38c, 0x580abbbd, 0x92792d19], + [0x9096ee9b, 0x8dd9fb14, 0x981e31e3, 0x3ffd7d29], + [0x22dc71ec, 0x3d8f6f7e, 0x1a198982, 0x41d17ecc]])); } }