use std::mem;
use std::ptr;
use nihav_core::codecs::*;
-use nihav_core::codecs::blockdsp::*;
+use nihav_codec_support::codecs::{MV, ZERO_MV, ZIGZAG};
+use nihav_codec_support::codecs::blockdsp::*;
use nihav_core::io::bitreader::*;
use nihav_core::io::codebook::*;
use nihav_core::io::intcode::*;
impl VP30Codes {
fn new() -> Self {
- let mut dc_cb: [Codebook<u8>; 5];
- let mut ac_i_cb: [Codebook<u8>; 5];
- let mut ac_p_cb: [Codebook<u8>; 5];
+ let dc_cb;
+ let ac_i_cb;
+ let ac_p_cb;
let mut cr = TableCodebookDescReader::new(&VP30_MBTYPE_CODES, &VP30_MBTYPE_BITS, map_mbt);
let mbtype_cb = Codebook::new(&mut cr, CodebookMode::MSB).unwrap();
unsafe {
- dc_cb = mem::uninitialized();
- ac_i_cb = mem::uninitialized();
- ac_p_cb = mem::uninitialized();
+ let mut udc_cb: mem::MaybeUninit::<[Codebook<u8>; 5]> = mem::MaybeUninit::uninit();
+ let mut uac_i_cb: mem::MaybeUninit::<[Codebook<u8>; 5]> = mem::MaybeUninit::uninit();
+ let mut uac_p_cb: mem::MaybeUninit::<[Codebook<u8>; 5]> = mem::MaybeUninit::uninit();
for i in 0..5 {
let mut cr = TableCodebookDescReader::new(&VP30_DC_CODES[i], &VP30_DC_BITS[i], map_idx);
let cb = Codebook::new(&mut cr, CodebookMode::MSB).unwrap();
- ptr::write(&mut dc_cb[i], cb);
+ ptr::write(&mut (*udc_cb.as_mut_ptr())[i], cb);
let mut cr = TableCodebookDescReader::new(&VP30_AC_INTRA_CODES[i], &VP30_AC_INTRA_BITS[i], map_idx);
let cb = Codebook::new(&mut cr, CodebookMode::MSB).unwrap();
- ptr::write(&mut ac_i_cb[i], cb);
+ ptr::write(&mut (*uac_i_cb.as_mut_ptr())[i], cb);
let mut cr = TableCodebookDescReader::new(&VP30_AC_INTER_CODES[i], &VP30_AC_INTER_BITS[i], map_idx);
let cb = Codebook::new(&mut cr, CodebookMode::MSB).unwrap();
- ptr::write(&mut ac_p_cb[i], cb);
+ ptr::write(&mut (*uac_p_cb.as_mut_ptr())[i], cb);
}
+ dc_cb = udc_cb.assume_init();
+ ac_i_cb = uac_i_cb.assume_init();
+ ac_p_cb = uac_p_cb.assume_init();
}
Self { dc_cb, ac_i_cb, ac_p_cb, mbtype_cb }
}
impl VP31Codes {
fn new() -> Self {
- let mut dc_cb: [Codebook<u8>; 16];
- let mut ac0_cb: [Codebook<u8>; 16];
- let mut ac1_cb: [Codebook<u8>; 16];
- let mut ac2_cb: [Codebook<u8>; 16];
- let mut ac3_cb: [Codebook<u8>; 16];
+ let dc_cb;
+ let ac0_cb;
+ let ac1_cb;
+ let ac2_cb;
+ let ac3_cb;
unsafe {
- dc_cb = mem::uninitialized();
- ac0_cb = mem::uninitialized();
- ac1_cb = mem::uninitialized();
- ac2_cb = mem::uninitialized();
- ac3_cb = mem::uninitialized();
+ let mut udc_cb: mem::MaybeUninit::<[Codebook<u8>; 16]> = mem::MaybeUninit::uninit();
+ let mut uac0_cb: mem::MaybeUninit::<[Codebook<u8>; 16]> = mem::MaybeUninit::uninit();
+ let mut uac1_cb: mem::MaybeUninit::<[Codebook<u8>; 16]> = mem::MaybeUninit::uninit();
+ let mut uac2_cb: mem::MaybeUninit::<[Codebook<u8>; 16]> = mem::MaybeUninit::uninit();
+ let mut uac3_cb: mem::MaybeUninit::<[Codebook<u8>; 16]> = mem::MaybeUninit::uninit();
for i in 0..16 {
let mut cr = TableCodebookDescReader::new(&VP31_DC_CODES[i], &VP31_DC_BITS[i], map_idx);
let cb = Codebook::new(&mut cr, CodebookMode::MSB).unwrap();
- ptr::write(&mut dc_cb[i], cb);
+ ptr::write(&mut (*udc_cb.as_mut_ptr())[i], cb);
let mut cr = TableCodebookDescReader::new(&VP31_AC_CAT0_CODES[i], &VP31_AC_CAT0_BITS[i], map_idx);
let cb = Codebook::new(&mut cr, CodebookMode::MSB).unwrap();
- ptr::write(&mut ac0_cb[i], cb);
+ ptr::write(&mut (*uac0_cb.as_mut_ptr())[i], cb);
let mut cr = TableCodebookDescReader::new(&VP31_AC_CAT1_CODES[i], &VP31_AC_CAT1_BITS[i], map_idx);
let cb = Codebook::new(&mut cr, CodebookMode::MSB).unwrap();
- ptr::write(&mut ac1_cb[i], cb);
+ ptr::write(&mut (*uac1_cb.as_mut_ptr())[i], cb);
let mut cr = TableCodebookDescReader::new(&VP31_AC_CAT2_CODES[i], &VP31_AC_CAT2_BITS[i], map_idx);
let cb = Codebook::new(&mut cr, CodebookMode::MSB).unwrap();
- ptr::write(&mut ac2_cb[i], cb);
+ ptr::write(&mut (*uac2_cb.as_mut_ptr())[i], cb);
let mut cr = TableCodebookDescReader::new(&VP31_AC_CAT3_CODES[i], &VP31_AC_CAT3_BITS[i], map_idx);
let cb = Codebook::new(&mut cr, CodebookMode::MSB).unwrap();
- ptr::write(&mut ac3_cb[i], cb);
+ ptr::write(&mut (*uac3_cb.as_mut_ptr())[i], cb);
}
+ dc_cb = udc_cb.assume_init();
+ ac0_cb = uac0_cb.assume_init();
+ ac1_cb = uac1_cb.assume_init();
+ ac2_cb = uac2_cb.assume_init();
+ ac3_cb = uac3_cb.assume_init();
}
Self { dc_cb, ac0_cb, ac1_cb, ac2_cb, ac3_cb }
}
fn new_vp4() -> VP31Codes {
- let mut dc_cb: [Codebook<u8>; 16];
- let mut ac0_cb: [Codebook<u8>; 16];
- let mut ac1_cb: [Codebook<u8>; 16];
- let mut ac2_cb: [Codebook<u8>; 16];
- let mut ac3_cb: [Codebook<u8>; 16];
+ let dc_cb;
+ let ac0_cb;
+ let ac1_cb;
+ let ac2_cb;
+ let ac3_cb;
unsafe {
- dc_cb = mem::uninitialized();
- ac0_cb = mem::uninitialized();
- ac1_cb = mem::uninitialized();
- ac2_cb = mem::uninitialized();
- ac3_cb = mem::uninitialized();
+ let mut udc_cb: mem::MaybeUninit::<[Codebook<u8>; 16]> = mem::MaybeUninit::uninit();
+ let mut uac0_cb: mem::MaybeUninit::<[Codebook<u8>; 16]> = mem::MaybeUninit::uninit();
+ let mut uac1_cb: mem::MaybeUninit::<[Codebook<u8>; 16]> = mem::MaybeUninit::uninit();
+ let mut uac2_cb: mem::MaybeUninit::<[Codebook<u8>; 16]> = mem::MaybeUninit::uninit();
+ let mut uac3_cb: mem::MaybeUninit::<[Codebook<u8>; 16]> = mem::MaybeUninit::uninit();
for i in 0..16 {
let mut cr = TableCodebookDescReader::new(&VP40_DC_CODES[i], &VP40_DC_BITS[i], map_idx);
let cb = Codebook::new(&mut cr, CodebookMode::MSB).unwrap();
- ptr::write(&mut dc_cb[i], cb);
+ ptr::write(&mut (*udc_cb.as_mut_ptr())[i], cb);
let mut cr = TableCodebookDescReader::new(&VP40_AC_CAT0_CODES[i], &VP40_AC_CAT0_BITS[i], map_idx);
let cb = Codebook::new(&mut cr, CodebookMode::MSB).unwrap();
- ptr::write(&mut ac0_cb[i], cb);
+ ptr::write(&mut (*uac0_cb.as_mut_ptr())[i], cb);
let mut cr = TableCodebookDescReader::new(&VP40_AC_CAT1_CODES[i], &VP40_AC_CAT1_BITS[i], map_idx);
let cb = Codebook::new(&mut cr, CodebookMode::MSB).unwrap();
- ptr::write(&mut ac1_cb[i], cb);
+ ptr::write(&mut (*uac1_cb.as_mut_ptr())[i], cb);
let mut cr = TableCodebookDescReader::new(&VP40_AC_CAT2_CODES[i], &VP40_AC_CAT2_BITS[i], map_idx);
let cb = Codebook::new(&mut cr, CodebookMode::MSB).unwrap();
- ptr::write(&mut ac2_cb[i], cb);
+ ptr::write(&mut (*uac2_cb.as_mut_ptr())[i], cb);
let mut cr = TableCodebookDescReader::new(&VP40_AC_CAT3_CODES[i], &VP40_AC_CAT3_BITS[i], map_idx);
let cb = Codebook::new(&mut cr, CodebookMode::MSB).unwrap();
- ptr::write(&mut ac3_cb[i], cb);
+ ptr::write(&mut (*uac3_cb.as_mut_ptr())[i], cb);
}
+ dc_cb = udc_cb.assume_init();
+ ac0_cb = uac0_cb.assume_init();
+ ac1_cb = uac1_cb.assume_init();
+ ac2_cb = uac2_cb.assume_init();
+ ac3_cb = uac3_cb.assume_init();
}
VP31Codes { dc_cb, ac0_cb, ac1_cb, ac2_cb, ac3_cb }
}
impl VP40AuxCodes {
fn new() -> Self {
- let mut mv_x_cb: [Codebook<i8>; 7];
- let mut mv_y_cb: [Codebook<i8>; 7];
+ let mv_x_cb;
+ let mv_y_cb;
unsafe {
- mv_x_cb = mem::uninitialized();
- mv_y_cb = mem::uninitialized();
+ let mut umv_x_cb: mem::MaybeUninit::<[Codebook<i8>; 7]> = mem::MaybeUninit::uninit();
+ let mut umv_y_cb: mem::MaybeUninit::<[Codebook<i8>; 7]> = mem::MaybeUninit::uninit();
for i in 0..7 {
let mut cr = TableCodebookDescReader::new(&VP40_MV_X_CODES[i], &VP40_MV_X_BITS[i], map_mv);
let cb = Codebook::new(&mut cr, CodebookMode::MSB).unwrap();
- ptr::write(&mut mv_x_cb[i], cb);
+ ptr::write(&mut (*umv_x_cb.as_mut_ptr())[i], cb);
let mut cr = TableCodebookDescReader::new(&VP40_MV_Y_CODES[i], &VP40_MV_Y_BITS[i], map_mv);
let cb = Codebook::new(&mut cr, CodebookMode::MSB).unwrap();
- ptr::write(&mut mv_y_cb[i], cb);
+ ptr::write(&mut (*umv_y_cb.as_mut_ptr())[i], cb);
}
+ mv_x_cb = umv_x_cb.assume_init();
+ mv_y_cb = umv_y_cb.assume_init();
}
let mut cr0 = TableCodebookDescReader::new(&VP40_MBPAT_CODES[0], &VP40_MBPAT_BITS[0], map_idx);
let mut cr1 = TableCodebookDescReader::new(&VP40_MBPAT_CODES[1], &VP40_MBPAT_BITS[1], map_idx);
}
}
+#[allow(clippy::large_enum_variant)]
enum Codes {
None,
VP30(VP30Codes),
self.run = (self.read_run)(br)?;
}
self.run -= 1;
- Ok(self.value)
+ Ok(self.value)
}
}
let idx = br.peek(5) as usize;
let sym = (VP30_CRUN1_LUT[idx] >> 4) as usize;
let bits = VP30_CRUN1_LUT[idx] & 0xF;
- br.skip(bits as u32)?;
+ br.skip(u32::from(bits))?;
if sym < 7 {
Ok(sym)
} else if sym == 7 {
mb_h: usize,
version: u8,
is_intra: bool,
+ update_gf: bool,
quant: usize,
shuf: VPShuffler,
codes: Codes,
dst_qmat[0] = (base_qmat[0] * dc_quant / 100).max(minval * 2) << 2;
}
-fn expand_token(blk: &mut Block, br: &mut BitReader, eob_run: &mut usize, coef_no: usize, token: u8) -> DecoderResult<()> {
+fn rescale_qmat_vp4(dst_qmat: &mut [i16; 64], base_qmat: &[i16; 64], dc_quant: i16, ac_quant: i16, is_intra: bool) {
+ let (bias, minval) = if is_intra { (3, 4) } else { (6, 8) };
+ for (dst, src) in dst_qmat.iter_mut().zip(base_qmat.iter()) {
+ *dst = ((src - bias).wrapping_mul(ac_quant) / 100 + bias) << 2;
+ }
+ dst_qmat[0] = (base_qmat[0] * dc_quant / 100).max(minval) << 2;
+}
+
+fn expand_token(blk: &mut Block, br: &mut BitReader, eob_run: &mut usize, token: u8) -> DecoderResult<()> {
match token {
// EOBs
0 | 1 | 2 => { *eob_run = (token as usize) + 1; },
if *eob_run > 0 {
blk.idx = 64;
*eob_run -= 1;
- } else if coef_no > 0 {
+ } else if (token > 8) && (blk.idx > 1) {
blk.has_ac = true;
}
Ok(())
macro_rules! fill_dc_pred {
($self: expr, $ref_id: expr, $pred: expr, $pp: expr, $bit: expr, $idx: expr) => {
if $self.blocks[$idx].coded && $self.blocks[$idx].btype.get_ref_id() == $ref_id {
- $pred[$bit] = $self.blocks[$idx].coeffs[0] as i32;
+ $pred[$bit] = i32::from($self.blocks[$idx].coeffs[0]);
$pp |= 1 << $bit;
}
};
}
-fn vp3_interp00(dst: &mut [u8], dstride: usize, src: &[u8], sstride: usize, bw: usize, bh: usize)
-{
- let mut didx = 0;
- let mut sidx = 0;
- for _ in 0..bh {
- for x in 0..bw { dst[didx + x] = src[sidx + x]; }
- didx += dstride;
- sidx += sstride;
- }
-}
-
-fn vp3_interp01(dst: &mut [u8], dstride: usize, src: &[u8], sstride: usize, bw: usize, bh: usize)
-{
- let mut didx = 0;
- let mut sidx = 0;
- for _ in 0..bh {
- for x in 0..bw { dst[didx + x] = (((src[sidx + x] as u16) + (src[sidx + x + 1] as u16)) >> 1) as u8; }
- didx += dstride;
- sidx += sstride;
- }
-}
-
-fn vp3_interp10(dst: &mut [u8], dstride: usize, src: &[u8], sstride: usize, bw: usize, bh: usize)
-{
- let mut didx = 0;
- let mut sidx = 0;
- for _ in 0..bh {
- for x in 0..bw { dst[didx + x] = (((src[sidx + x] as u16) + (src[sidx + x + sstride] as u16)) >> 1) as u8; }
- didx += dstride;
- sidx += sstride;
- }
-}
-
-fn vp3_interp11(dst: &mut [u8], dstride: usize, src: &[u8], sstride: usize, bw: usize, bh: usize)
-{
- let mut didx = 0;
- let mut sidx = 0;
- for _ in 0..bh {
- for x in 0..bw {
- dst[didx + x] = (((src[sidx + x] as u16) +
- (src[sidx + x + 1] as u16) +
- (src[sidx + x + sstride] as u16) +
- (src[sidx + x + sstride + 1] as u16)) >> 2) as u8;
- }
- didx += dstride;
- sidx += sstride;
- }
-}
-
fn vp31_loop_filter_v(frm: &mut NASimpleVideoFrame<u8>, x: usize, y: usize, plane: usize, loop_str: i16) {
let off = frm.offset[plane] + x + y * frm.stride[plane];
vp31_loop_filter(frm.data, off, 1, frm.stride[plane], 8, loop_str);
vp31_loop_filter(frm.data, off, frm.stride[plane], 1, 8, loop_str);
}
-pub const VP3_INTERP_FUNCS: &[blockdsp::BlkInterpFunc] = &[ vp3_interp00, vp3_interp01, vp3_interp10, vp3_interp11 ];
+fn vp3_mv_mode(mvx: i16, mvy: i16) -> usize {
+ let mode = ((mvx & 1) + (mvy & 1) * 2) as usize;
+ if (mode == 3) && (mvx ^ mvy < 0) {
+ 4
+ } else {
+ mode
+ }
+}
impl VP34Decoder {
fn new(version: u8) -> Self {
mb_h: 0,
version,
is_intra: true,
+ update_gf: false,
quant: 0,
shuf: VPShuffler::new(),
codes: Codes::None,
validate!(self.version == 3 || self.version == 30);
let mb_w = br.read(8)? as usize;
let mb_h = br.read(8)? as usize;
-println!(" VP30 {}x{} ({}x{})", mb_w, mb_h, self.mb_w, self.mb_h);
validate!(mb_w == self.mb_w && mb_h == self.mb_h);
if self.version == 3 {
self.version = 30;
}
} else {
let version = br.read(13)?;
-println!("intra, ver {} (self {})", version, self.version);
let coding_type = br.read(1)?;
validate!(coding_type == 0);
br.skip(2)?;
validate!(self.version == 4);
let mb_h = br.read(8)? as usize;
let mb_w = br.read(8)? as usize;
-//println!(" VP40 {}x{} ({}x{})", mb_w, mb_h, self.mb_w, self.mb_h);
validate!(mb_w == self.mb_w && mb_h == self.mb_h);
let fact1 = br.read(5)?;
let fact2 = br.read(3)?;
} else {
VP40_LOOP_STRENGTH[self.quant]
};
-//println!("decode frame({},{},{})", self.is_intra as u8, self.is_intra as u8, self.quant);
Ok(())
}
fn vp30_unpack_sb_info(&mut self, br: &mut BitReader) -> DecoderResult<()> {
&codes.ac_p_cb[table]
};
let token = br.read_cb(cb)?;
- expand_token(blk, br, &mut self.eob_run, coef_no, token)?;
+ expand_token(blk, br, &mut self.eob_run, token)?;
}
Ok(())
} else {
let mut cur_blk = 0;
for _ in 0..self.y_blocks/4 {
if self.blocks[self.blk_addr[cur_blk] >> 2].btype == VPMBType::InterFourMV {
- for _ in 0..4 {
- let blk = &mut self.blocks[self.blk_addr[cur_blk] >> 2];
- if blk.coded {
- blk.mv = (read_mv)(br)?;
- last2_mv = last_mv;
- last_mv = blk.mv;
- }
- cur_blk += 1;
- }
+ let a0 = self.blk_addr[cur_blk + 0] >> 2;
+ let a1 = self.blk_addr[cur_blk + 1] >> 2;
+ let a2 = self.blk_addr[cur_blk + 2] >> 2;
+ let a3 = self.blk_addr[cur_blk + 3] >> 2;
+ let first = a0.min(a1).min(a2).min(a3);
+ let last = a0.max(a1).max(a2).max(a3);
+ self.blocks[first + 0].mv = (read_mv)(br)?;
+ self.blocks[first + 1].mv = (read_mv)(br)?;
+ self.blocks[last - 1].mv = (read_mv)(br)?;
+ self.blocks[last + 0].mv = (read_mv)(br)?;
+ last2_mv = last_mv;
+ last_mv = self.blocks[last].mv;
+ cur_blk += 4;
} else {
let cur_mv;
match self.blocks[self.blk_addr[cur_blk] >> 2].btype {
}
let cb = if (blkaddr & 3) == 0 { cbs[0] } else { cbs[1] };
let token = br.read_cb(cb)?;
- expand_token(blk, br, &mut self.eob_run, coef_no, token)?;
+ expand_token(blk, br, &mut self.eob_run, token)?;
}
Ok(())
} else {
cur_blk += 1;
}
}
- }
+ }
}
Ok(())
} else {
last2_mv = last_mv;
let saddr = (self.blk_addr[cur_blk] >> 2).min(self.blk_addr[cur_blk + 1] >> 2).min(self.blk_addr[cur_blk + 2] >> 2).min(self.blk_addr[cur_blk + 3] >> 2);
for i in 0..4 {
- let blk = &mut self.blocks[saddr + (i & 1) + (i >> 1) * self.mb_w];
- blk.mv.x = br.read_cb(x_cb)? as i16;
+ let blk = &mut self.blocks[saddr + (i & 1) + (i >> 1) * self.mb_w * 2];
+ blk.mv.x = i16::from(br.read_cb(x_cb)?);
if x_sign {
blk.mv.x = -blk.mv.x;
}
- blk.mv.y = br.read_cb(y_cb)? as i16;
+ blk.mv.y = i16::from(br.read_cb(y_cb)?);
if y_sign {
blk.mv.y = -blk.mv.y;
}
let y_cb = &codes.mv_y_cb[VP40_MV_LUT_INDEX[last_mv.y.abs() as usize]];
let x_sign = last_mv.x < 0;
let y_sign = last_mv.y < 0;
- let x = br.read_cb(x_cb)? as i16;
- let y = br.read_cb(y_cb)? as i16;
+ let x = i16::from(br.read_cb(x_cb)?);
+ let y = i16::from(br.read_cb(y_cb)?);
cur_mv = MV { x: if !x_sign { x } else { -x }, y: if !y_sign { y } else { -y } };
last2_mv = last_mv;
last_mv = cur_mv;
let y_cb = &codes.mv_y_cb[VP40_MV_LUT_INDEX[last_mv_g.y.abs() as usize]];
let x_sign = last_mv_g.x < 0;
let y_sign = last_mv_g.y < 0;
- let x = br.read_cb(x_cb)? as i16;
- let y = br.read_cb(y_cb)? as i16;
+ let x = i16::from(br.read_cb(x_cb)?);
+ let y = i16::from(br.read_cb(y_cb)?);
cur_mv = MV { x: if !x_sign { x } else { -x }, y: if !y_sign { y } else { -y } };
last_mv_g = cur_mv;
},
fn vp40_unpack_coeffs(&mut self, br: &mut BitReader, dc_table_y: usize, dc_table_c: usize, ac_table_y: usize, ac_table_c: usize) -> DecoderResult<()> {
const VP40_PRED_MASKS: [usize; 16] = [ // top, bottom, left, right
0b1010, 0b1010, 0b1000, 0b1011,
- 0b1010, 0b1010, 0b0010, 0b1111,
+ 0b1010, 0b1010, 0b0010, 0b1110,
0b0010, 0b1010, 0b0010, 0b0110,
0b0100, 0b0111, 0b1110, 0b1110
];
};
let cb = if (blkaddr & 3) == 0 { cbs[0] } else { cbs[1] };
let token = br.read_cb(cb)?;
- expand_token(blk, br, &mut coef_eob[blk.idx], blk.idx, token)?;
+ expand_token(blk, br, &mut coef_eob[blk.idx], token)?;
if blk.idx == 64 { break; }
}
let idx = blkaddr >> 2;
}
let dc_quant = VP30_DC_SCALES[self.quant] * 10;
let ac_quant = VP30_AC_SCALES[self.quant];
+
+ self.update_gf = ac_quant <= 50;
+
rescale_qmat(&mut self.qmat_y, VP3_QMAT_Y, dc_quant, ac_quant, 2);
rescale_qmat(&mut self.qmat_c, VP3_QMAT_C, dc_quant, ac_quant, 2);
rescale_qmat(&mut self.qmat_y_p, VP3_QMAT_INTER, dc_quant, ac_quant, 4);
let dc_y_quant = VP40_DC_Y_SCALES[self.quant];
let dc_c_quant = VP40_DC_C_SCALES[self.quant];
let ac_quant = VP40_AC_SCALES[self.quant];
- rescale_qmat(&mut self.qmat_y, VP40_QMAT, dc_y_quant, ac_quant, 2);
- rescale_qmat(&mut self.qmat_c, VP40_QMAT, dc_c_quant, ac_quant, 2);
- self.qmat_y_p.copy_from_slice(&self.qmat_y);
- self.qmat_c_p.copy_from_slice(&self.qmat_c);
+ rescale_qmat_vp4(&mut self.qmat_y, VP40_QMAT, dc_y_quant, ac_quant, true);
+ rescale_qmat_vp4(&mut self.qmat_y_p, VP40_QMAT, dc_c_quant, ac_quant, false);
+ self.qmat_c.copy_from_slice(&self.qmat_y);
+ self.qmat_c_p.copy_from_slice(&self.qmat_y_p);
self.eob_run = 0;
let dc_table_y = br.read(4)? as usize;
let mut pred = 0i32;
for i in 0..4 {
if (pp & (1 << i)) != 0 {
- pred += (preds[i] as i32) * (VP31_DC_WEIGHTS[pp][i] as i32);
+ pred += (preds[i] as i32) * i32::from(VP31_DC_WEIGHTS[pp][i]);
}
}
- pred /= VP31_DC_WEIGHTS[pp][4] as i32;
+ pred /= i32::from(VP31_DC_WEIGHTS[pp][4]);
if (pp & 7) == 7 {
if (pred - preds[2]).abs() > 128 { return preds[2] as i16; }
if (pred - preds[0]).abs() > 128 { return preds[0] as i16; }
}
}
}
+ #[allow(clippy::cognitive_complexity)]
fn output_blocks_inter(&mut self, frm: &mut NASimpleVideoFrame<u8>) {
let mut blk_idx = 0;
let bstride = self.mb_w * 2;
if self.blocks[blk_idx + bx].btype != VPMBType::InterFourMV {
continue;
}
- let mv_a = self.blocks[blk_idx + bx].mv;
- let mv_b = self.blocks[blk_idx + bx + 1].mv;
- let mv_c = self.blocks[blk_idx + bx + bstride].mv;
- let mv_d = self.blocks[blk_idx + bx + 1 + bstride].mv;
- let mut mv_sum = mv_a + mv_b + mv_c + mv_d;
+ let mvs = [ self.blocks[blk_idx + bx].mv,
+ self.blocks[blk_idx + bx + 1].mv,
+ self.blocks[blk_idx + bx + bstride].mv,
+ self.blocks[blk_idx + bx + 1 + bstride].mv ];
+ let mut mv_sum = mvs[0] + mvs[1] + mvs[2] + mvs[3];
mv_sum.x = (mv_sum.x + 2) >> 2;
mv_sum.y = (mv_sum.y + 2) >> 2;
let src = self.shuf.get_last().unwrap();
- let mode = ((mv_a.x & 1) + (mv_a.y & 1) * 2) as usize;
- if self.version != 4 {
- copy_block(frm, src.clone(), 0, bx * 8, by * 8,
- mv_a.x >> 1, mv_a.y >> 1, 8, 8, 0, 1, mode, VP3_INTERP_FUNCS);
- } else {
- vp_copy_block(frm, src.clone(), 0, bx * 8, by * 8,
- mv_a.x >> 1, mv_a.y >> 1, 0, 1, self.loop_str,
- mode, VP3_INTERP_FUNCS, self.mc_buf.clone());
- }
- let mode = ((mv_b.x & 1) + (mv_b.y & 1) * 2) as usize;
- if self.version != 4 {
- copy_block(frm, src.clone(), 0, bx * 8 + 8, by * 8,
- mv_b.x >> 1, mv_b.y >> 1, 8, 8, 0, 1, mode, VP3_INTERP_FUNCS);
- } else {
- vp_copy_block(frm, src.clone(), 0, bx * 8 + 8, by * 8,
- mv_b.x >> 1, mv_b.y >> 1, 0, 1, self.loop_str,
- mode, VP3_INTERP_FUNCS, self.mc_buf.clone());
- }
- let mode = ((mv_c.x & 1) + (mv_c.y & 1) * 2) as usize;
- if self.version != 4 {
- copy_block(frm, src.clone(), 0, bx * 8, by * 8 + 8,
- mv_c.x >> 1, mv_c.y >> 1, 8, 8, 0, 1, mode, VP3_INTERP_FUNCS);
- } else {
- vp_copy_block(frm, src.clone(), 0, bx * 8, by * 8 + 8,
- mv_c.x >> 1, mv_c.y >> 1, 0, 1, self.loop_str,
- mode, VP3_INTERP_FUNCS, self.mc_buf.clone());
- }
- let mode = ((mv_d.x & 1) + (mv_d.y & 1) * 2) as usize;
- if self.version != 4 {
- copy_block(frm, src.clone(), 0, bx * 8 + 8, by * 8 + 8,
- mv_d.x >> 1, mv_d.y >> 1, 8, 8, 0, 1, mode, VP3_INTERP_FUNCS);
- } else {
- vp_copy_block(frm, src.clone(), 0, bx * 8 + 8, by * 8 + 8,
- mv_d.x >> 1, mv_d.y >> 1, 0, 1, self.loop_str,
- mode, VP3_INTERP_FUNCS, self.mc_buf.clone());
+ for i in 0..4 {
+ let xoff = (i & 1) * 8;
+ let yoff = (i >> 1) * 8;
+
+ let mode = vp3_mv_mode(mvs[i].x, mvs[i].y);
+ if self.version != 4 {
+ copy_block(frm, src.clone(), 0, bx * 8 + xoff, by * 8 + yoff,
+ mvs[i].x >> 1, mvs[i].y >> 1, 8, 8, 0, 1, mode, VP3_INTERP_FUNCS);
+ } else {
+ vp_copy_block(frm, src.clone(), 0, bx * 8 + xoff, by * 8 + yoff,
+ mvs[i].x >> 1, mvs[i].y >> 1, 0, 1, self.loop_str,
+ mode, VP3_INTERP_FUNCS, self.mc_buf.clone());
+ }
}
let mx = (mv_sum.x >> 1) | (mv_sum.x & 1);
let my = (mv_sum.y >> 1) | (mv_sum.y & 1);
- let mode = ((mx & 1) + (my & 1) * 2) as usize;
+ let mode = vp3_mv_mode(mx, my);
copy_block(frm, src.clone(), 1, bx * 4, by * 4, mx >> 1, my >> 1, 8, 8, 0, 1, mode, VP3_INTERP_FUNCS);
copy_block(frm, src.clone(), 2, bx * 4, by * 4, mx >> 1, my >> 1, 8, 8, 0, 1, mode, VP3_INTERP_FUNCS);
}
} else {
self.shuf.get_golden().unwrap()
};
- let mode = ((blk.mv.x & 1) + (blk.mv.y & 1) * 2) as usize;
+ let mode = vp3_mv_mode(blk.mv.x, blk.mv.y);
if self.version != 4 {
copy_block(frm, src.clone(), 0, bx * 8, by * 8,
blk.mv.x >> 1, blk.mv.y >> 1, 16, 16, 0, 1, mode, VP3_INTERP_FUNCS);
}
let mx = (blk.mv.x >> 1) | (blk.mv.x & 1);
let my = (blk.mv.y >> 1) | (blk.mv.y & 1);
- let mode = ((mx & 1) + (my & 1) * 2) as usize;
+ let mode = vp3_mv_mode(mx, my);
if self.version != 4 {
copy_block(frm, src.clone(), 1, bx * 4, by * 4,
mx >> 1, my >> 1, 8, 8, 0, 1, mode, VP3_INTERP_FUNCS);
if blk.has_ac {
unquant(&mut blk.coeffs, qmat);
}
- if blk.btype.is_intra() {
- if !blk.coded {
- copy_block(frm, self.shuf.get_last().unwrap(), 0, bx * 8, by * 8, 0, 0, 8, 8, 0, 1, 0, VP3_INTERP_FUNCS);
- } else if blk.has_ac {
+ if !blk.coded {
+ copy_block(frm, self.shuf.get_last().unwrap(), 0, bx * 8, by * 8, 0, 0, 8, 8, 0, 1, 0, VP3_INTERP_FUNCS);
+ } else if blk.btype.is_intra() {
+ if blk.has_ac {
vp_put_block(&mut blk.coeffs, bx, by, 0, frm);
} else {
vp_put_block_dc(&mut blk.coeffs, bx, by, 0, frm);
}
- } else if blk.coded {
+ } else {
if blk.has_ac {
vp_add_block(&mut blk.coeffs, bx, by, 0, frm);
} else {
if blk.has_ac {
unquant(&mut blk.coeffs, qmat);
}
- if blk.btype.is_intra() {
- if !blk.coded {
- copy_block(frm, self.shuf.get_last().unwrap(), plane, bx * 8, by * 8, 0, 0, 8, 8, 0, 1, 0, VP3_INTERP_FUNCS);
- } else if blk.has_ac {
+ if !blk.coded {
+ copy_block(frm, self.shuf.get_last().unwrap(), plane, bx * 8, by * 8, 0, 0, 8, 8, 0, 1, 0, VP3_INTERP_FUNCS);
+ } else if blk.btype.is_intra() {
+ if blk.has_ac {
vp_put_block(&mut blk.coeffs, bx, by, plane, frm);
} else {
vp_put_block_dc(&mut blk.coeffs, bx, by, plane, frm);
}
- } else if blk.coded {
+ } else {
if blk.has_ac {
vp_add_block(&mut blk.coeffs, bx, by, plane, frm);
} else {
}
blk_idx += blk_w;
}
-/* for plane in 1..3 {
+ let blk_w = self.mb_w;
+ for plane in 1..3 {
for by in 0..self.mb_h {
for bx in 0..self.mb_w {
+ let blk = &self.blocks[blk_idx + bx];
+ if (bx > 0) && blk.coded {
+ vp31_loop_filter_v(frm, bx * 8, by * 8, plane, self.loop_str);
+ }
+ if (by > 0) && blk.coded {
+ vp31_loop_filter_h(frm, bx * 8, by * 8, plane, self.loop_str);
+ }
+ if (bx < blk_w - 1) && !self.blocks[blk_idx + bx + 1].coded {
+ vp31_loop_filter_v(frm, bx * 8 + 8, by * 8, plane, self.loop_str);
+ }
+ if (by < self.mb_h - 1) && !self.blocks[blk_idx + bx + blk_w].coded {
+ vp31_loop_filter_h(frm, bx * 8, by * 8 + 8, plane, self.loop_str);
+ }
}
+ blk_idx += blk_w;
}
- }*/
+ }
}
fn generate_block_addr(&mut self) {
let sb_w_y = (self.width + 31) >> 5;
let myinfo = NACodecTypeInfo::Video(NAVideoInfo::new(vinfo.get_width(), vinfo.get_height(), true, fmt));
self.info = NACodecInfo::new_ref(info.get_name(), myinfo, info.get_extradata()).into_ref();
supp.pool_u8.set_dec_bufs(3);
- supp.pool_u8.prealloc_video(NAVideoInfo::new(vinfo.get_width(), vinfo.get_height(), false, fmt), 4)?;
+ supp.pool_u8.prealloc_video(NAVideoInfo::new(vinfo.get_width(), vinfo.get_height(), true, fmt), 4)?;
self.generate_block_addr();
if self.version == 4 {
fn decode(&mut self, supp: &mut NADecoderSupport, pkt: &NAPacket) -> DecoderResult<NAFrameRef> {
let src = pkt.get_buffer();
validate!(src.len() > 0);
- let mut br = BitReader::new(&src, src.len(), BitReaderMode::BE);
+ let mut br = BitReader::new(&src, BitReaderMode::BE);
self.parse_header(&mut br)?;
if self.is_intra {
self.shuf.clear();
+ } else {
+ if !self.shuf.has_refs() {
+ return Err(DecoderError::MissingReference);
+ }
}
let ret = supp.pool_u8.get_free();
_ => return Err(DecoderError::Bug),
}
- if self.is_intra {
+ if self.is_intra || self.update_gf {
self.shuf.add_golden_frame(buf.clone());
}
self.shuf.add_frame(buf.clone());
frm.set_frame_type(if self.is_intra { FrameType::I } else { FrameType::P });
Ok(frm.into_ref())
}
+ fn flush(&mut self) {
+ self.shuf.clear();
+ }
+}
+
+impl NAOptionHandler for VP34Decoder {
+ 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_vp3() -> Box<NADecoder> {
+pub fn get_decoder_vp3() -> Box<dyn NADecoder + Send> {
Box::new(VP34Decoder::new(3))
}
-pub fn get_decoder_vp4() -> Box<NADecoder> {
+pub fn get_decoder_vp4() -> Box<dyn NADecoder + Send> {
Box::new(VP34Decoder::new(4))
}
mod test {
use nihav_core::codecs::RegisteredDecoders;
use nihav_core::demuxers::RegisteredDemuxers;
- use nihav_core::test::dec_video::*;
- use crate::codecs::duck_register_all_codecs;
- use nihav_commonfmt::demuxers::generic_register_all_demuxers;
+ use nihav_codec_support::test::dec_video::*;
+ use crate::duck_register_all_decoders;
+ use nihav_commonfmt::generic_register_all_demuxers;
#[test]
fn test_vp30() {
let mut dmx_reg = RegisteredDemuxers::new();
generic_register_all_demuxers(&mut dmx_reg);
let mut dec_reg = RegisteredDecoders::new();
- duck_register_all_codecs(&mut dec_reg);
+ duck_register_all_decoders(&mut dec_reg);
- let file = "assets/Duck/vp30-logo.avi";
- test_file_decoding("avi", file, Some(23), true, false, None/*Some("vp30")*/, &dmx_reg, &dec_reg);
+ // sample: https://samples.mplayerhq.hu/V-codecs/VP3/vp30-logo.avi
+ test_decoding("avi", "vp3", "assets/Duck/vp30-logo.avi", Some(23), &dmx_reg, &dec_reg,
+ ExpectedTestResult::MD5([0x51aba7df, 0x6e42534d, 0xef6c5b13, 0x26c38d1f]));
}
#[test]
let mut dmx_reg = RegisteredDemuxers::new();
generic_register_all_demuxers(&mut dmx_reg);
let mut dec_reg = RegisteredDecoders::new();
- duck_register_all_codecs(&mut dec_reg);
+ duck_register_all_decoders(&mut dec_reg);
- let file = "assets/Duck/vp31.avi";
+// let file = "assets/Duck/vp31.avi";
// let file = "assets/Duck/vp31_crash.avi";
// let file = "assets/Duck/01-vp31-0500.avi";
- test_file_decoding("avi", file, Some(3), true, false, None/*Some("vp31")*/, &dmx_reg, &dec_reg);
+// test_file_decoding("avi", file, Some(3), true, false, None/*Some("vp31")*/, &dmx_reg, &dec_reg);
//panic!("end");
+ // sample: https://samples.mplayerhq.hu/V-codecs/VP3/01-vp31-0500.avi
+ test_decoding("avi", "vp3", "assets/Duck/01-vp31-0500.avi", Some(16), &dmx_reg, &dec_reg,
+ ExpectedTestResult::MD5([0x65112f7e, 0x2914f29b, 0x2908ed2f, 0xce5fc8c5]));
}
#[test]
let mut dmx_reg = RegisteredDemuxers::new();
generic_register_all_demuxers(&mut dmx_reg);
let mut dec_reg = RegisteredDecoders::new();
- duck_register_all_codecs(&mut dec_reg);
+ duck_register_all_decoders(&mut dec_reg);
- let file = "assets/Duck/ot171_vp40.avi";
- test_file_decoding("avi", file, Some(16), true, false, None/*Some("vp4")*/, &dmx_reg, &dec_reg);
-//panic!("end");
+ // sample: https://samples.mplayerhq.hu/V-codecs/VP4/ot171_vp40.avi
+ test_decoding("avi", "vp3", "assets/Duck/ot171_vp40.avi", Some(86), &dmx_reg, &dec_reg,
+ ExpectedTestResult::MD5([0xd41d8cd9, 0x8f00b204, 0xe9800998, 0xecf8427e]));
}
}
40, 48, 64, 64, 64, 96, 128, 128
];
-const ZIGZAG: [usize; 64] = [
- 0, 1, 8, 16, 9, 2, 3, 10,
- 17, 24, 32, 25, 18, 11, 4, 5,
- 12, 19, 26, 33, 40, 48, 41, 34,
- 27, 20, 13, 6, 7, 14, 21, 28,
- 35, 42, 49, 56, 57, 50, 43, 36,
- 29, 22, 15, 23, 30, 37, 44, 51,
- 58, 59, 52, 45, 38, 31, 39, 46,
- 53, 60, 61, 54, 47, 55, 62, 63
-];
-
const VP31_DC_CODES: [[u16; 32]; 16] = [
[
0x002D, 0x0026, 0x0166, 0x004E, 0x02CE, 0x059E, 0x027D, 0x0008,