height: usize,
cw: usize,
ch: usize,
- buf1: Vec<u8>,
- buf2: Vec<u8>,
- fbuf: bool,
+ sbuf: Vec<u8>,
+ dbuf: Vec<u8>,
}
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.clear();
+ self.dbuf.clear();
}
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 }
}
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 {
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 {
+ self.dbuf[didx..][..w].copy_from_slice(&self.sbuf[sidx..][..w]);
+ 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 {
+ self.dbuf[didx..][..w].copy_from_slice(&buf[..w]);
+ didx += stride;
}
}
}
#[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; }
#[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; }
}
#[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 {
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)] };
- for i in 0..bw { buf[i] = src[i]; }
+ let src = &bufs.dbuf[(off - stride)..(off - stride + bw)];
+ buf[..bw].copy_from_slice(&src[..bw]);
} 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)] };
- for i in 0..bw { dst[i] = buf[i]; }
+ let dst = &mut bufs.dbuf[off..][..bw];
+ dst.copy_from_slice(&buf[..bw]);
}
fn copy_line_top4x4(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)] };
- for i in 0..8 {dst[i] = buf[i]; }
+ let dst = &mut bufs.dbuf[off..][..8];
+ dst.copy_from_slice(&buf[..8]);
}
fn fill_block8x8(bufs: &mut Buffers, doff: usize, stride: usize, h: usize, topline: bool, firstline: bool) {
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 {
+ bufs.dbuf[didx..][..8].copy_from_slice(&buf[..8]);
+ didx += stride;
}
}
altquant: [u8; 16],
vq_offset: u8,
bufs: Buffers,
+ requant_tab: [[u8; 128]; 8],
}
#[derive(Clone,Copy)]
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) {
Ok((self.bbuf >> self.bpos) & 0x3)
}
+ #[allow(clippy::cognitive_complexity)]
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 };
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 {
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 {
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;
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,
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 {
} 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,
let nvec = br.read_u32le()?;
validate!(nvec == 0); // for intra there should be no mc_vecs
- self.mvs.truncate(0);
+ self.mvs.clear();
for _ in 0..nvec {
let x = br.read_byte()? as i8;
let y = br.read_byte()? as i8;
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);
let nvec = br.read_u32le()?;
validate!(nvec <= 256); // for intra there should be no mc_vecs
- self.mvs.truncate(0);
+ self.mvs.clear();
for _ in 0..nvec {
let y = br.read_byte()? as i8;
let x = br.read_byte()? as i8;
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);
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;
validate!((width >= 16) && (width <= 640));
validate!((height >= 16) && (height <= 640));
validate!(((width & 3) == 0) && ((height & 3) == 0));
+ let vinfo;
if (self.bufs.width != (width as usize)) || (self.bufs.height != (height as usize)) {
self.bufs.alloc(width as usize, height as usize);
+ vinfo = NAVideoInfo::new(width as usize, height as usize, false, formats::YUV410_FORMAT);
+ } else {
+ vinfo = self.info.get_properties().get_video_info().unwrap();
}
self.width = width;
self.height = height;
if (uoff < vend) && (uoff > voff) { vend = uoff; }
let intraframe = (flags & FLAG_KEYFRAME) != 0;
- let vinfo = self.info.get_properties().get_video_info().unwrap();
- validate!((vinfo.get_width() & !3) == (self.width & !3).into());
- validate!((vinfo.get_height() & !3) == (self.height & !3).into());
let bufinfo = alloc_video_buffer(vinfo, 4)?;
let mut buf = bufinfo.get_vbuf().unwrap();
let ystart = data_start + u64::from(yoff);
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(); }
}
}
+impl NAOptionHandler for Indeo3Decoder {
+ 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<dyn NADecoder + Send> {
Box::new(Indeo3Decoder::new())
}
mod test {
use nihav_core::codecs::RegisteredDecoders;
use nihav_core::demuxers::RegisteredDemuxers;
- use nihav_core::test::dec_video::*;
- use crate::codecs::indeo_register_all_codecs;
- use nihav_commonfmt::demuxers::generic_register_all_demuxers;
+ use nihav_codec_support::test::dec_video::*;
+ use crate::indeo_register_all_decoders;
+ use nihav_commonfmt::generic_register_all_demuxers;
#[test]
fn test_indeo3() {
let mut dmx_reg = RegisteredDemuxers::new();
generic_register_all_demuxers(&mut dmx_reg);
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);
+ indeo_register_all_decoders(&mut 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]]));
}
}
projects / nihav.git / blobdiff