Merge "Refactor vp10_xform_quant" into nextgenv2

diff --cc vp10/common/blockd.h
Simple merge

diff --cc vp10/encoder/block.h
Simple merge

diff --cc vp10/encoder/rdopt.c
index e4bc0184647057de5d7a14e353294156da1048d5,379ff1be4bcdba16b16ffad36b25be02b01b7aaa..22a0f920d98ba616588d430feeaadaf63f1233dc
--- 1/vp10/encoder/rdopt.c
--- 2/vp10/encoder/rdopt.c
+++ b/vp10/encoder/rdopt.c
@@@ -2093,22 -1962,11 +2094,23 @@@ static void tx_block_rd_b(const VP10_CO
    if (xd->mb_to_right_edge < 0)
      max_blocks_wide += xd->mb_to_right_edge >> (5 + pd->subsampling_x);
  
-   vp10_xform_quant(x, plane, block, blk_row, blk_col, plane_bsize, tx_size);
+   vp10_xform_quant(x, plane, block, blk_row, blk_col, plane_bsize, tx_size,
+                    VP10_XFORM_QUANT_B);
  
 +#if CONFIG_VP9_HIGHBITDEPTH
 +  if (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH) {
 +    rec_buffer = CONVERT_TO_BYTEPTR(rec_buffer_alloc_16);
 +    vpx_highbd_convolve_copy(dst, pd->dst.stride, rec_buffer, 32,
 +                             NULL, 0, NULL, 0, bh, bh, xd->bd);
 +  } else {
 +    rec_buffer = (uint8_t *)rec_buffer_alloc_16;
 +    vpx_convolve_copy(dst, pd->dst.stride, rec_buffer, 32,
 +                      NULL, 0, NULL, 0, bh, bh);
 +  }
 +#else
    vpx_convolve_copy(dst, pd->dst.stride, rec_buffer, 32,
                      NULL, 0, NULL, 0, bh, bh);
 +#endif
  
    if (blk_row + (bh >> 2) > max_blocks_high ||
        blk_col + (bh >> 2) > max_blocks_wide) {