Fix shift value in dist_block with hbd

This offset value related to the bit depth has been taken care of
inside the function vp10_highbd_block_error.

Change-Id: I58dd8a53380ba4529d59837e56a951bc81a2962e

diff --git a/vp10/encoder/rdopt.c b/vp10/encoder/rdopt.c
index a91af70dbd1d87bd3e7ff98b2f3dbe4b193f59d7..8b64936714c82df12b7e273082d7bd2c93492df4 100644 (file)
--- a/vp10/encoder/rdopt.c
+++ b/vp10/encoder/rdopt.c
@@ -1066,9 +1066,6 @@ static void dist_block(const VP10_COMP *cpi, MACROBLOCK *x, int plane,
     tran_low_t *const dqcoeff = BLOCK_OFFSET(pd->dqcoeff, block);
 #if CONFIG_VP9_HIGHBITDEPTH
     const int bd = (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH) ? xd->bd : 8;
-    if (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH && xd->bd == BITDEPTH_10) {
-      shift = 2;
-    }
     *out_dist = vp10_highbd_block_error(coeff, dqcoeff, 16 << ss_txfrm_size,
                                         &this_sse, bd) >> shift;
 #else