X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-indeo%2Fsrc%2Fcodecs%2Findeo3.rs;h=c9296f6d1515ade6c91a1725fc325b613f301c9e;hb=3bc2f5a46543f7c599bac482ef49f633ce4e15eb;hp=9687f94a0fa217695b07200aa47c8f755a5168a3;hpb=f2af8ecaeed8ec8c1fa6b3c2cfdb075d64994b7a;p=nihav.git diff --git a/nihav-indeo/src/codecs/indeo3.rs b/nihav-indeo/src/codecs/indeo3.rs index 9687f94..c9296f6 100644 --- a/nihav-indeo/src/codecs/indeo3.rs +++ b/nihav-indeo/src/codecs/indeo3.rs @@ -20,30 +20,29 @@ struct Buffers { height: usize, cw: usize, ch: usize, - buf1: Vec, - buf2: Vec, - fbuf: bool, + sbuf: Vec, + dbuf: Vec, } const DEFAULT_PIXEL: u8 = 0x40; impl Buffers { - fn new() -> Self { Buffers { width: 0, height: 0, cw: 0, ch: 0, buf1: Vec::new(), buf2: Vec::new(), fbuf: true } } + fn new() -> Self { Buffers { width: 0, height: 0, cw: 0, ch: 0, sbuf: Vec::new(), dbuf: Vec::new() } } fn reset(&mut self) { self.width = 0; self.height = 0; - self.buf1.truncate(0); - self.buf2.truncate(0); + self.sbuf.truncate(0); + self.dbuf.truncate(0); } fn alloc(&mut self, w: usize, h: usize) { self.width = w; self.height = h; self.cw = ((w >> 2) + 3) & !3; self.ch = ((h >> 2) + 3) & !3; - self.buf1.resize(w * h + self.cw * self.ch * 2, DEFAULT_PIXEL); - self.buf2.resize(w * h + self.cw * self.ch * 2, DEFAULT_PIXEL); + self.sbuf.resize(w * h + self.cw * self.ch * 2, DEFAULT_PIXEL); + self.dbuf.resize(w * h + self.cw * self.ch * 2, DEFAULT_PIXEL); } - fn flip(&mut self) { self.fbuf = !self.fbuf; } + fn flip(&mut self) { std::mem::swap(&mut self.sbuf, &mut self.dbuf); } fn get_stride(&mut self, planeno: usize) -> usize { if planeno == 0 { self.width } else { self.cw } } @@ -62,7 +61,7 @@ impl Buffers { let dstride = fbuf.get_stride(planeno); let width = if planeno == 0 { self.width } else { self.width >> 2 }; let height = if planeno == 0 { self.height } else { self.height >> 2 }; - let src = if self.fbuf { &self.buf1[0..] } else { &self.buf2[0..] }; + let src = self.dbuf.as_slice(); let dst = fbuf.get_data_mut().unwrap(); for _ in 0..height { for x in 0..width { @@ -76,48 +75,25 @@ impl Buffers { fn copy_block(&mut self, doff: usize, soff: usize, stride: usize, w: usize, h: usize) { let mut sidx = soff; let mut didx = doff; - if self.fbuf { - for _ in 0..h { - for i in 0..w { self.buf1[didx + i] = self.buf2[sidx + i]; } - sidx += stride; - didx += stride; - } - } else { - for _ in 0..h { - for i in 0..w { self.buf2[didx + i] = self.buf1[sidx + i]; } - sidx += stride; - didx += stride; - } + for _ in 0..h { + for i in 0..w { self.dbuf[didx + i] = self.sbuf[sidx + i]; } + sidx += stride; + didx += stride; } } fn fill_block(&mut self, doff: usize, stride: usize, w: usize, h: usize, topline: bool) { let mut didx = doff; let mut buf: [u8; 8] = [0; 8]; if topline { - if self.fbuf { - for _ in 0..h { - for i in 0..w { self.buf1[didx + i] = DEFAULT_PIXEL; } - didx += stride; - } - } else { - for _ in 0..h { - for i in 0..w { self.buf2[didx + i] = DEFAULT_PIXEL; } - didx += stride; - } + for _ in 0..h { + for i in 0..w { self.dbuf[didx + i] = DEFAULT_PIXEL; } + didx += stride; } } else { - if self.fbuf { - for i in 0..w { buf[i] = self.buf1[didx - stride + i]; } - for _ in 0..h { - for i in 0..w { self.buf1[didx + i] = buf[i]; } - didx += stride; - } - } else { - for i in 0..w { buf[i] = self.buf2[didx - stride + i]; } - for _ in 0..h { - for i in 0..w { self.buf2[didx + i] = buf[i]; } - didx += stride; - } + for i in 0..w { buf[i] = self.dbuf[didx - stride + i]; } + for _ in 0..h { + for i in 0..w { self.dbuf[didx + i] = buf[i]; } + didx += stride; } } } @@ -126,16 +102,14 @@ impl Buffers { #[allow(unused_variables)] fn apply_delta4x4(bufs: &mut Buffers, off: usize, stride: usize, deltas: &[u8], topline: bool, first_line: bool) { - let dst = if bufs.fbuf { &mut bufs.buf1[off..(off + 4)] } - else { &mut bufs.buf2[off..(off + 4)] }; + let dst = &mut bufs.dbuf[off..][..4]; for i in 0..4 { dst[i] = dst[i].wrapping_add(deltas[i]) & 0x7F; } } #[allow(unused_variables)] fn apply_delta4x8(bufs: &mut Buffers, off: usize, stride: usize, deltas: &[u8], topline: bool, first_line: bool) { - let dst = if bufs.fbuf { &mut bufs.buf1[off..(off + 4 + stride)] } - else { &mut bufs.buf2[off..(off + 4 + stride)] }; + let dst = &mut bufs.dbuf[off..][..stride + 4]; for i in 0..4 { dst[i + stride] = dst[i].wrapping_add(deltas[i]) & 0x7F; } if !topline { for i in 0..4 { dst[i] = (dst[i + stride] + dst[i]) >> 1; } @@ -147,8 +121,7 @@ fn apply_delta4x8(bufs: &mut Buffers, off: usize, stride: usize, #[allow(unused_variables)] fn apply_delta4x8m11(bufs: &mut Buffers, off: usize, stride: usize, deltas: &[u8], topline: bool, first_line: bool) { - let dst = if bufs.fbuf { &mut bufs.buf1[off..(off + 4 + stride)] } - else { &mut bufs.buf2[off..(off + 4 + stride)] }; + let dst = &mut bufs.dbuf[off..][..stride + 4]; for i in 0..4 { dst[i] = dst[i] .wrapping_add(deltas[i]) & 0x7F; } for i in 0..4 { dst[i + stride] = dst[i + stride].wrapping_add(deltas[i]) & 0x7F; } } @@ -156,16 +129,14 @@ fn apply_delta4x8m11(bufs: &mut Buffers, off: usize, stride: usize, #[allow(unused_variables)] fn apply_delta8x8p(bufs: &mut Buffers, off: usize, stride: usize, deltas: &[u8], topline: bool, first_line: bool) { - let dst = if bufs.fbuf { &mut bufs.buf1[off..(off + 8 + stride)] } - else { &mut bufs.buf2[off..(off + 8 + stride)] }; + let dst = &mut bufs.dbuf[off..][..stride + 8]; for i in 0..8 { dst[i] = dst[i] .wrapping_add(deltas[i >> 1]) & 0x7F; } for i in 0..8 { dst[i + stride] = dst[i + stride].wrapping_add(deltas[i >> 1]) & 0x7F; } } fn apply_delta8x8i(bufs: &mut Buffers, off: usize, stride: usize, deltas: &[u8], topline: bool, firstline: bool) { - let dst = if bufs.fbuf { &mut bufs.buf1[off..(off + 8 + stride)] } - else { &mut bufs.buf2[off..(off + 8 + stride)] }; + let dst = &mut bufs.dbuf[off..][..stride + 8]; if !firstline { for i in 0..8 { dst[i + stride] = dst[i ].wrapping_add(deltas[i >> 1]) & 0x7F; } } else { @@ -181,14 +152,12 @@ fn apply_delta8x8i(bufs: &mut Buffers, off: usize, stride: usize, fn copy_line_top(bufs: &mut Buffers, off: usize, stride: usize, bw: usize, topline: bool) { let mut buf: [u8; 8] = [0; 8]; if !topline { - let src = if bufs.fbuf { &bufs.buf1[(off - stride)..(off - stride + bw)] } - else { &bufs.buf2[(off - stride)..(off - stride + bw)] }; + let src = &bufs.dbuf[(off - stride)..(off - stride + bw)]; for i in 0..bw { buf[i] = src[i]; } } else { for i in 0..bw { buf[i] = DEFAULT_PIXEL; } } - let dst = if bufs.fbuf { &mut bufs.buf1[off..(off + bw)] } - else { &mut bufs.buf2[off..(off + bw)] }; + let dst = &mut bufs.dbuf[off..][..bw]; for i in 0..bw { dst[i] = buf[i]; } } @@ -204,14 +173,12 @@ fn copy_line_top4x8(bufs: &mut Buffers, off: usize, stride: usize, topline: bool fn copy_line_top8x8(bufs: &mut Buffers, off: usize, stride: usize, topline: bool) { let mut buf: [u8; 8] = [0; 8]; if !topline { - let src = if bufs.fbuf { &bufs.buf1[(off - stride)..(off - stride + 8)] } - else { &bufs.buf2[(off - stride)..(off - stride + 8)] }; + let src = &bufs.dbuf[(off - stride)..(off - stride + 8)]; for i in 0..8 { buf[i] = src[i & !1]; } } else { for i in 0..8 { buf[i] = DEFAULT_PIXEL; } } - let dst = if bufs.fbuf { &mut bufs.buf1[off..(off + 8)] } - else { &mut bufs.buf2[off..(off + 8)] }; + let dst = &mut bufs.dbuf[off..][..8]; for i in 0..8 {dst[i] = buf[i]; } } @@ -220,34 +187,21 @@ fn fill_block8x8(bufs: &mut Buffers, doff: usize, stride: usize, h: usize, topli let mut buf: [u8; 8] = [0; 8]; if firstline { for i in 0..8 { buf[i] = DEFAULT_PIXEL; } - } else if bufs.fbuf { - for i in 0..8 { buf[i] = bufs.buf1[doff - stride + i]; } } else { - for i in 0..8 { buf[i] = bufs.buf2[doff - stride + i]; } + for i in 0..8 { buf[i] = bufs.dbuf[doff - stride + i]; } } if topline && !firstline { for i in 0..4 { buf[i * 2 + 1] = buf[i * 2]; } - if bufs.fbuf { - for i in 0..8 { bufs.buf1[doff + i] = (bufs.buf1[doff - stride + i] + buf[i]) >> 1; } - } else { - for i in 0..8 { bufs.buf2[doff + i] = (bufs.buf2[doff - stride + i] + buf[i]) >> 1; } - } + for i in 0..8 { bufs.dbuf[doff + i] = (bufs.dbuf[doff - stride + i] + buf[i]) >> 1; } } let start = if !topline { 0 } else { 1 }; if topline { didx += stride; } - if bufs.fbuf { - for _ in start..h { - for i in 0..8 { bufs.buf1[didx + i] = buf[i]; } - didx += stride; - } - } else { - for _ in start..h { - for i in 0..8 { bufs.buf2[didx + i] = buf[i]; } - didx += stride; - } + for _ in start..h { + for i in 0..8 { bufs.dbuf[didx + i] = buf[i]; } + didx += stride; } } @@ -261,6 +215,7 @@ struct Indeo3Decoder { altquant: [u8; 16], vq_offset: u8, bufs: Buffers, + requant_tab: [[u8; 128]; 8], } #[derive(Clone,Copy)] @@ -328,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) { @@ -349,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 }; @@ -361,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 { @@ -377,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 { @@ -412,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; @@ -478,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, @@ -541,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 { @@ -586,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, @@ -649,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); @@ -674,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); @@ -720,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; @@ -769,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(); } @@ -783,9 +786,12 @@ impl NADecoder for Indeo3Decoder { frm.set_frame_type(if intraframe { FrameType::I } else { FrameType::P }); Ok(frm.into_ref()) } + fn flush(&mut self) { + self.bufs.reset(); + } } -pub fn get_decoder() -> Box { +pub fn get_decoder() -> Box { Box::new(Indeo3Decoder::new()) }