X-Git-Url: https://git.nihav.org/?a=blobdiff_plain;f=nihav-duck%2Fsrc%2Fcodecs%2Fvp3.rs;h=947377498cf698d95cbace4d5d33462a2296f0a2;hb=72c6f2634b57fe73d101376602e21b81bebf3c1a;hp=acb783f21d9143eecb029ec0132116daf98ea9ea;hpb=08a1fab72215ea7716f51adf7008f85372e80c71;p=nihav.git diff --git a/nihav-duck/src/codecs/vp3.rs b/nihav-duck/src/codecs/vp3.rs index acb783f..9473774 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(()) @@ -820,7 +820,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 { @@ -1013,7 +1013,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 +1212,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,50 +1537,28 @@ 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 = ((mvs[i].x & 1) + (mvs[i].y & 1) * 2) as usize; + 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); @@ -1709,12 +1687,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 +1787,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 {