Merge "Remove plane_block_idx."

This commit is contained in:
Alex Converse
2013-12-03 10:51:13 -08:00
committed by Gerrit Code Review
3 changed files with 10 additions and 37 deletions

View File

@@ -1055,7 +1055,7 @@ static int64_t rd_pick_intra4x4block(VP9_COMP *cpi, MACROBLOCK *x, int ib,
else
x->fwd_txm4x4(src_diff, coeff, 8);
vp9_regular_quantize_b_4x4(x, 4, block, so->scan, so->iscan);
vp9_regular_quantize_b_4x4(x, 0, block, so->scan, so->iscan);
ratey += cost_coeffs(x, 0, block, tempa + idx, templ + idy, TX_4X4,
so->scan, so->neighbors);
@@ -1541,7 +1541,7 @@ static int64_t encode_inter_mb_segment(VP9_COMP *cpi,
coeff = BLOCK_OFFSET(p->coeff, k);
x->fwd_txm4x4(raster_block_offset_int16(BLOCK_8X8, k, p->src_diff),
coeff, 8);
vp9_regular_quantize_b_4x4(x, 4, k, so->scan, so->iscan);
vp9_regular_quantize_b_4x4(x, 0, k, so->scan, so->iscan);
thisdistortion += vp9_block_error(coeff, BLOCK_OFFSET(pd->dqcoeff, k),
16, &ssz);
thissse += ssz;