X-Git-Url: https://git.nihav.org/?p=nihav.git;a=blobdiff_plain;f=nihav-duck%2Fsrc%2Fcodecs%2Fvp3.rs;h=eace89e0c2383ebb7a77e89bddaa15482e0fb600;hp=dd71c8b9cb1e1271672efbce65a0475da0087283;hb=138b7d0a1f3baeac9427f194fd9a3f83abb22651;hpb=f9be4e750dccff762b9a3d894faec50ffdb59233 diff --git a/nihav-duck/src/codecs/vp3.rs b/nihav-duck/src/codecs/vp3.rs index dd71c8b..eace89e 100644 --- a/nihav-duck/src/codecs/vp3.rs +++ b/nihav-duck/src/codecs/vp3.rs @@ -425,7 +425,7 @@ fn rescale_qmat(dst_qmat: &mut [i16; 64], base_qmat: &[i16; 64], dc_quant: i16, 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 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; }, @@ -527,7 +527,7 @@ fn expand_token(blk: &mut Block, br: &mut BitReader, eob_run: &mut usize, coef_n 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(()) @@ -552,6 +552,15 @@ fn vp31_loop_filter_h(frm: &mut NASimpleVideoFrame, x: usize, y: usize, plan 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(); @@ -602,7 +611,6 @@ impl VP34Decoder { 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; @@ -610,7 +618,6 @@ println!(" VP30 {}x{} ({}x{})", mb_w, mb_h, self.mb_w, self.mb_h); } } 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)?; @@ -624,7 +631,6 @@ println!("intra, ver {} (self {})", version, self.version); 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)?; @@ -643,7 +649,6 @@ println!("intra, ver {} (self {})", version, self.version); } 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<()> { @@ -820,7 +825,7 @@ println!("intra, ver {} (self {})", version, self.version); &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 { @@ -951,15 +956,19 @@ println!("intra, ver {} (self {})", version, self.version); 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 { @@ -1013,7 +1022,7 @@ println!("intra, ver {} (self {})", version, self.version); } 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 { @@ -1212,7 +1221,7 @@ println!("intra, ver {} (self {})", version, self.version); }; 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; @@ -1537,55 +1546,33 @@ println!("intra, ver {} (self {})", version, self.version); 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); } @@ -1603,7 +1590,7 @@ println!("intra, ver {} (self {})", version, self.version); } 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); @@ -1623,7 +1610,7 @@ println!("intra, ver {} (self {})", version, self.version); } 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); @@ -1643,15 +1630,15 @@ println!("intra, ver {} (self {})", version, self.version); 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 { @@ -1669,15 +1656,15 @@ println!("intra, ver {} (self {})", version, self.version); 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 { @@ -1709,12 +1696,27 @@ println!("intra, ver {} (self {})", version, self.version); } 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; @@ -1794,7 +1796,7 @@ impl NADecoder for VP34Decoder { 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 { @@ -1814,6 +1816,10 @@ impl NADecoder for VP34Decoder { 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(); @@ -1844,11 +1850,11 @@ impl NADecoder for VP34Decoder { } } -pub fn get_decoder_vp3() -> Box { +pub fn get_decoder_vp3() -> Box { Box::new(VP34Decoder::new(3)) } -pub fn get_decoder_vp4() -> Box { +pub fn get_decoder_vp4() -> Box { Box::new(VP34Decoder::new(4)) } @@ -1878,11 +1884,13 @@ mod 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]