fn has_top_block(&self, xpos: usize, ypos: usize, dx: usize, dy: usize, size: usize) -> bool {
if (ypos + dy) == 0 { return false; }
let xpos2 = xpos + dx;
- if (xpos2 + size) > self.width { return false; }
+ if (xpos2 + size) > self.awidth { return false; }
true
}
fn has_top_right_block(&self, xpos: usize, ypos: usize, dx: usize, dy: usize, size: usize) -> bool {
if (ypos + dy) == 0 { return false; }
let xpos2 = xpos + dx;
- if (xpos2 + size * 2) > self.width { return false; }
+ if (xpos2 + size * 2) > self.awidth { return false; }
let cxpos = ((xpos + dx) & 63) >> RV60_BLOCK_LOG2[size];
let cypos = ((ypos + dy) & 63) >> RV60_BLOCK_LOG2[size];
((cypos as u8) & RV60_AVAIL_MASK[cxpos]) == 0
fn has_left_block(&self, xpos: usize, ypos: usize, dx: usize, dy: usize, size: usize) -> bool {
if (xpos + dx) == 0 { return false; }
let ypos2 = ypos + dy;
- if (ypos2 + size) > self.height { return false; }
+ if (ypos2 + size) > self.aheight { return false; }
true
}
fn has_left_down_block(&self, xpos: usize, ypos: usize, dx: usize, dy: usize, size: usize) -> bool {
if (xpos + dx) == 0 { return false; }
let ypos2 = ypos + dy;
- if (ypos2 + size * 2) > self.height { return false; }
+ if (ypos2 + size * 2) > self.aheight { return false; }
let cxpos = (!(xpos + dx) & 63) >> RV60_BLOCK_LOG2[size];
let cypos = (!(ypos + dy) & 63) >> RV60_BLOCK_LOG2[size];
((cypos as u8) & RV60_AVAIL_MASK[cxpos]) >= 1
struct PUInfo {
cu_type: CUType,
ttype: TransformType,
+ pu_type: PUType,
}
impl PUInfo {
let dval = (q << 2) | strength;
for x in 0..dsize {
self.top_str[pos + x] = dval;
+ self.top_str[pos + (dsize - 1) * self.stride + x] = dval;
}
for y in 0..dsize {
self.left_str[pos + y * self.stride] = dval;
+ self.left_str[pos + y * self.stride + dsize - 1] = dval;
}
}
fn get_pos(&self, xpos: usize, ypos: usize) -> usize {
cbp16 = 0;
}
if cbp16 != 0 {
- self.coded_blk[cb_pos + 0] = true;
- self.coded_blk[cb_pos + 1] = true;
- self.coded_blk[cb_pos + 8] = true;
- self.coded_blk[cb_pos + 9] = true;
rv6_decode_cu_4x4in16x16(br, &self.cbs, is_intra, self.qp, self.sel_qp, &mut self.y_coeffs, &mut self.u_coeffs, &mut self.v_coeffs, cbp16)?;
for y in 0..4 {
for x in 0..4 {
let off = xpos + x * 4 + (ypos + y * 4) * dstride;
let dst = &mut buf.data;
self.dsp.add_block(dst, off, dstride, &self.y_coeffs[i*16..][..16], 4);
+ self.coded_blk[cb_pos + (y / 2) * 8 + (x / 2)] = true;
}
}
}
let off = buf.offset[1] + xoff + yoff * dstride;
let dst = &mut buf.data;
self.dsp.add_block(dst, off, dstride, &self.u_coeffs[i * 16..][..16], 4);
+ self.coded_blk[cb_pos + y * 8 + x] = true;
}
if ((cbp16 >> (20 + i)) & 1) != 0 {
self.dsp.transform4x4(&mut self.v_coeffs[i * 16..][..16]);
let off = buf.offset[2] + xoff + yoff * dstride;
let dst = &mut buf.data;
self.dsp.add_block(dst, off, dstride, &self.v_coeffs[i * 16..][..16], 4);
+ self.coded_blk[cb_pos + y * 8 + x] = true;
}
}
}
let pu_size = size >> 3;
pui.cu_type = cbh.cu_type;
pui.ttype = cbh.ttype;
+ pui.pu_type = cbh.pu_type;
if (cbh.cu_type == CUType::Intra) && (cbh.pu_type == PUType::Quarters) { // very special case
self.pu_info[self.pu_pos] = pui;
for y in 0..2 {
skip_cand.list[i] = MVInfo { f_mv: ZERO_MV, b_mv: ZERO_MV, mvref: MVRef::Ref0 };
}
}
+ fn calc_tile_size(&self, pu_pos: usize, cu_type: CUType, log_size: u8) -> u8 {
+ match log_size {
+ 3 => 3,
+ 4 if (cu_type != CUType::Intra) && (self.pu_info[pu_pos].pu_type != PUType::Full) => 3,
+ 4 | 5 | 6 => 4,
+ _ => unreachable!(),
+ }
+ }
fn deblock_cb_tree(&mut self, buf: &mut NASimpleVideoFrame<u8>, hdr: &FrameHeader, xpos: usize, ypos: usize, log_size: u8) {
- if (xpos >= hdr.width) || (ypos >= hdr.height) { return; }
- let split = (log_size > 3) && self.cu_splits.pop().unwrap();
+ if (xpos >= hdr.awidth) || (ypos >= hdr.aheight) { return; }
+ let split = self.cu_splits.pop().unwrap();
if split {
let hsize = 1 << (log_size - 1);
self.deblock_cb_tree(buf, hdr, xpos, ypos, log_size - 1);
} else {
let pu_pos = (xpos >> 3) + (ypos >> 3) * self.pu_stride;
let cu_type = self.pu_info[pu_pos].cu_type;
- let tsize = if self.pu_info[pu_pos].ttype == TransformType::T16X16 { 4 } else { 3 };
+ let tsize = self.calc_tile_size(pu_pos, cu_type, log_size);
let ntiles = 1 << (log_size - tsize);
let dparams = RV60DeblockParams {
deblock_chroma: hdr.deblock_chroma,
- width: hdr.width,
- height: hdr.height,
+ width: hdr.awidth,
+ height: hdr.aheight,
dblkstride: self.dblk.stride,
};
for ty in 0..ntiles {
if ypos > 0 {
let top_blk_pos = blk_pos - self.blk_stride;
for i in 0..size4 {
- if self.dblk.get_top_strength(dblk_pos + i) == 0 {
+ if self.dblk.get_top_strength(dblk_pos - self.dblk.stride + i) == 0 {
if self.blk_info[blk_pos + i].mv.is_deblock_cand(&self.blk_info[top_blk_pos + i].mv) {
self.dblk.set_top_strength(dblk_pos + i, 1);
}
}
if xpos > 0 {
for i in 0..size4 {
- if self.dblk.get_left_strength(dblk_pos) == 0 {
- if self.blk_info[blk_pos + i].mv.is_deblock_cand(&self.blk_info[blk_pos + i - 1].mv) {
+ if self.dblk.get_left_strength(dblk_pos - 1) == 0 {
+ if self.blk_info[blk_pos + i * self.blk_stride].mv.is_deblock_cand(&self.blk_info[blk_pos + i * self.blk_stride - 1].mv) {
self.dblk.set_left_strength(dblk_pos, 1);
}
}
test_decoding("realmedia", "realvideo6", "assets/RV/RV60.rmhd", Some(1000), &dmx_reg, &dec_reg,
ExpectedTestResult::MD5Frames(vec![
[0x2b1f1807, 0x09edef33, 0x0e6c78c1, 0x3b3c8179],
- [0x9b8feb58, 0x161b1b44, 0xbca532e5, 0xcb4ac211],
+ [0xc7d45c3b, 0x6a82ff3a, 0xaf49a7ea, 0x7cf9a533],
[0x2b1f1807, 0x09edef33, 0x0e6c78c1, 0x3b3c8179],
- [0x5dc8b7d1, 0xef6e6840, 0x7b634afb, 0x645711a3],
- [0x64e802be, 0xd80dc046, 0x98309de0, 0xe9f2ee48],
- [0x64d1fa65, 0xfe30eccf, 0x08e07dd5, 0xb7f079ec],
- [0xfae26181, 0x63e190ec, 0xfa0ae49c, 0x095abb3c],
- [0xc6491458, 0xf3a1e979, 0x6f4e64ab, 0xe77046cb],
- [0x4ec5e66d, 0x5a99a40d, 0x871b16ab, 0xf63b2890],
- [0x2d22683b, 0x4022a36b, 0xdfcd3259, 0xa7f43f77],
- [0xff6a1c72, 0x2dd8b7ca, 0xe3f2f575, 0x2d7aa001],
- [0xf95f1898, 0x1660a50d, 0x2b36aacc, 0x921b5402],
- [0x8115fafe, 0x39ac33b2, 0x9d65b3cc, 0x5ec452fe]]));
+ [0xec3cf068, 0xe989c7f5, 0x0bd41758, 0x81199c9e],
+ [0x24134118, 0xeece4c59, 0x3f319c04, 0xd04951fd],
+ [0x5a2e4e52, 0xa11ad66f, 0x304f2a84, 0xe43aaa90],
+ [0x06d8bb44, 0x00b83933, 0xacce3d6f, 0x7159cd5e],
+ [0xe5dfb853, 0x93f2fe74, 0x932d8c1a, 0x2579208e],
+ [0xcfc5cae6, 0xa878bbd5, 0x5f0302c5, 0x9c0623ae],
+ [0x5103a4ad, 0xec5ebe4e, 0x445037ca, 0x3797abe1],
+ [0x66c9b636, 0xaec1afb7, 0x978fa6eb, 0x964649f5],
+ [0xf1d17b76, 0xe8351888, 0x59d4acf1, 0x22387b9e],
+ [0x8fff649f, 0xf1fe573b, 0xfce60560, 0x47c8c8b1]]));
}
}
projects / nihav.git / blobdiff