From 49222c3718af47244b1193bf4bafc2ce18e10d30 Mon Sep 17 00:00:00 2001
From: Jingning Han <jingning@google.com>
Date: Wed, 29 Jun 2016 16:40:47 -0700
Subject: [PATCH] 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
---
vp10/encoder/rdopt.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/vp10/encoder/rdopt.c b/vp10/encoder/rdopt.c
index a91af70dbd..8b64936714 100644
--- 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
--
GitLab