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.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 }
}
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 {
+ 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;
}
}
}
#[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)] };
+ 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]; }
}
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]; }
}
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.buf1[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;
}
}
impl IV3Cell {
fn new(w: u16, h: u16) -> Self {
- IV3Cell { x: 0, y: 0, w: w, h: h, d: 20, vqt: false, mv: None }
+ IV3Cell { x: 0, y: 0, w, h, d: 20, vqt: false, mv: None }
}
fn split_h(&self) -> (Self, Self) {
let h1 = if self.h > 2 { ((self.h + 2) >> 2) << 1 } else { 1 };
cell2.d -= 1;
(cell1, cell2)
}
- fn no_mv(&self) -> bool { match self.mv { None => true, Some(_) => false } }
+ fn no_mv(&self) -> bool { self.mv.is_none() }
}
struct CellDecParams {
sidx = 0;
} else {
let mv = cell.mv.unwrap();
- let mx = mv.x as i16;
- let my = mv.y as i16;
+ let mx = i16::from(mv.x);
+ let my = i16::from(mv.y);
let l = (cell.x as i16) * 4 + mx;
let t = (cell.y as i16) * 4 + my;
let r = ((cell.x + cell.w) as i16) * 4 + mx;
tocopy = 4 - line;
}
if c >= 0xFD {
- let nl = 257 - (c as i16) - (line as i16);
+ let nl = 257 - i16::from(c) - (line as i16);
validate!(nl > 0);
tocopy = nl as usize;
}
fn copy_cell(&mut self, cell: IV3Cell, off: usize, stride: usize) -> DecoderResult<()> {
if cell.no_mv() { return Err(DecoderError::InvalidData); }
let mv = cell.mv.unwrap();
- let mx = mv.x as i16;
- let my = mv.y as i16;
+ let mx = i16::from(mv.x);
+ let my = i16::from(mv.y);
let l = (cell.x as i16) * 4 + mx;
let t = (cell.y as i16) * 4 + my;
let r = ((cell.x + cell.w) as i16) * 4 + mx;
for _ in 0..nvec {
let x = br.read_byte()? as i8;
let y = br.read_byte()? as i8;
- self.mvs.push(MV{ x: x, y: y });
+ self.mvs.push(MV{ x, y });
}
let shift = if planeno == 0 { 2 } else { 4 };
for _ in 0..nvec {
let y = br.read_byte()? as i8;
let x = br.read_byte()? as i8;
- self.mvs.push(MV{ x: x, y: y });
+ self.mvs.push(MV{ x, y });
}
let shift = if planeno == 0 { 2 } else { 4 };
const FLAG_NONREF: u16 = 1 << 8;
impl NADecoder for Indeo3Decoder {
- 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 w = vinfo.get_width();
let h = vinfo.get_height();
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();
let mut mr = MemoryReader::new_read(&src);
let mut br = ByteReader::new(&mut mr);
if (frameno ^ hdr_2 ^ size ^ FRMH_TAG) != check {
return Err(DecoderError::InvalidData);
}
- if (size as i64) > br.left() { return Err(DecoderError::InvalidData); }
+ if i64::from(size) > br.left() { return Err(DecoderError::InvalidData); }
let ver = br.read_u16le()?;
if ver != 32 { return Err(DecoderError::NotImplemented); }
let flags = br.read_u16le()?;
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 bufret = alloc_video_buffer(vinfo, 4);
- if let Err(_) = bufret { return Err(DecoderError::InvalidData); }
- let bufinfo = bufret.unwrap();
+ let bufinfo = alloc_video_buffer(vinfo, 4)?;
let mut buf = bufinfo.get_vbuf().unwrap();
- let ystart = data_start + (yoff as u64);
- let ustart = data_start + (uoff as u64);
- let vstart = data_start + (voff as u64);
- let yendpos = data_start + (yend as u64);
- let uendpos = data_start + (uend as u64);
- let vendpos = data_start + (vend as u64);
+ let ystart = data_start + u64::from(yoff);
+ let ustart = data_start + u64::from(uoff);
+ let vstart = data_start + u64::from(voff);
+ let yendpos = data_start + u64::from(yend);
+ let uendpos = data_start + u64::from(uend);
+ 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)?;
let mut frm = NAFrame::new_from_pkt(pkt, self.info.clone(), bufinfo);
frm.set_keyframe(intraframe);
frm.set_frame_type(if intraframe { FrameType::I } else { FrameType::P });
- Ok(Rc::new(RefCell::new(frm)))
+ Ok(frm.into_ref())
+ }
+ fn flush(&mut self) {
+ self.bufs.reset();
}
}
-pub fn get_decoder() -> Box<NADecoder> {
+pub fn get_decoder() -> Box<dyn NADecoder + Send> {
Box::new(Indeo3Decoder::new())
}
projects / nihav.git / blobdiff