self.run = (self.read_run)(br)?;
}
self.run -= 1;
- Ok(self.value)
+ Ok(self.value)
}
}
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(())
vp31_loop_filter(frm.data, off, frm.stride[plane], 1, 8, loop_str);
}
+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 {
let vt = alloc_video_buffer(NAVideoInfo::new(24, 24, false, YUV420_FORMAT), 4).unwrap();
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];
+ let blk = &mut self.blocks[saddr + (i & 1) + (i >> 1) * self.mb_w * 2];
blk.mv.x = br.read_cb(x_cb)? as i16;
if x_sign {
blk.mv.x = -blk.mv.x;
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;
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());
}
}
-pub fn get_decoder_vp3() -> Box<NADecoder> {
+pub fn get_decoder_vp3() -> Box<NADecoder + Send> {
Box::new(VP34Decoder::new(3))
}
-pub fn get_decoder_vp4() -> Box<NADecoder> {
+pub fn get_decoder_vp4() -> Box<NADecoder + Send> {
Box::new(VP34Decoder::new(4))
}
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 crate::duck_register_all_codecs;
+ use nihav_commonfmt::generic_register_all_demuxers;
#[test]
fn test_vp30() {
let mut dec_reg = RegisteredDecoders::new();
duck_register_all_codecs(&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);
+ test_decoding("avi", "vp3", "assets/Duck/vp30-logo.avi", Some(23), &dmx_reg, &dec_reg,
+ ExpectedTestResult::MD5([0x51aba7df, 0x6e42534d, 0xef6c5b13, 0x26c38d1f]));
}
#[test]
let mut dec_reg = RegisteredDecoders::new();
duck_register_all_codecs(&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");
+ 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 dec_reg = RegisteredDecoders::new();
duck_register_all_codecs(&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");
+ test_decoding("avi", "vp3", "assets/Duck/ot171_vp40.avi", Some(86), &dmx_reg, &dec_reg,
+ ExpectedTestResult::MD5([0xd41d8cd9, 0x8f00b204, 0xe9800998, 0xecf8427e]));
}
}
projects / nihav.git / blobdiff