shithub: libvpx

Info  •  Files  •  Log  •  Branches

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

--- a/vp9/encoder/vp9_rdopt.c

+++ b/vp9/encoder/vp9_rdopt.c

@@ -1093,7 +1093,7 @@

         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 @@

       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);