diff options
| author | Jingning Han <jingning@google.com> | 2013-11-03 11:16:38 -0800 |
|---|---|---|
| committer | Jingning Han <jingning@google.com> | 2013-11-03 11:19:33 -0800 |
| commit | 4efa6a0176570c032b12ab9e964424c2c2f43adc (patch) | |
| tree | 9db4b98acd2de723b4a8fdf848f297b75f0a22f2 /vp9 | |
| parent | 2de7cbe98007e0b70ca6088773434e179b3c83c1 (diff) | |
| download | libvpx-4efa6a0176570c032b12ab9e964424c2c2f43adc.tar libvpx-4efa6a0176570c032b12ab9e964424c2c2f43adc.tar.gz libvpx-4efa6a0176570c032b12ab9e964424c2c2f43adc.tar.bz2 libvpx-4efa6a0176570c032b12ab9e964424c2c2f43adc.zip | |
Fix the use case of plane_block_idx in sub8x8 RD
This commit fixes the use case of plane_block_idx, which determines
the plane (Y/U/V) index based on block index. When block idx >= 4 in
sub8x8 block loop, it should be of chroma components.
Change-Id: I072705aa7b35445524ac607089ca8ce54b7ba478
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index 682a2a690..f83c1aea7 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -1093,7 +1093,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, 16, block, scan, get_iscan_4x4(tx_type)); + vp9_regular_quantize_b_4x4(x, 4, block, scan, get_iscan_4x4(tx_type)); ratey += cost_coeffs(x, 0, block, tempa + idx, templ + idy, TX_4X4, scan, nb); @@ -1560,7 +1560,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, 16, k, get_scan_4x4(DCT_DCT), + vp9_regular_quantize_b_4x4(x, 4, k, get_scan_4x4(DCT_DCT), get_iscan_4x4(DCT_DCT)); thisdistortion += vp9_block_error(coeff, BLOCK_OFFSET(pd->dqcoeff, k), 16, &ssz); |