Fix a bug for high-bit-depth in av1_dist_block()

BUG=aomedia:426 Change-Id: I246b0de3bd25863853643bdb238899bf8e5847be

Fix a bug for high-bit-depth in av1_dist_block()
BUG=aomedia:426 Change-Id: I246b0de3bd25863853643bdb238899bf8e5847be
b1cc1f9d · hui su · Hui Su · 18ad894a · b1cc1f9d
Commit b1cc1f9d authored Apr 11, 2017 by hui su Committed by Hui Su Apr 12, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

av1/encoder/rdopt.c av1/encoder/rdopt.c +4 -0

No files found.
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -1459,6 +1459,10 @@ void av1_dist_block(const AV1_COMP *cpi, MACROBLOCK *x, int plane,
      const int16_t *diff = &p->src_diff[diff_idx];
      tmp = sum_squares_visible(xd, plane, diff, diff_stride, blk_row, blk_col,
                                plane_bsize, tx_bsize);
+#if CONFIG_AOM_HIGHBITDEPTH
+      if (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH)
+        tmp = ROUND_POWER_OF_TWO(tmp, (xd->bd - 8) * 2);
+#endif  // CONFIG_AOM_HIGHBITDEPTH
    }
    *out_sse = (int64_t)tmp * 16;