commit fd65c8dcfc7c95c183f6b4df2333b4d1ae011e3c
author Debargha Mukherjee <debargha@google.com> Tue Nov 07 15:45:55 2017 -0800
committer Debargha Mukherjee <debargha@google.com> Wed Nov 08 22:55:20 2017 +0000
tree ab886ab25a3830a0e75e806456363edc437ff8ef
parent e09a9a6c86a3d56216d6ed1e11657ba750d32716

Fix to hashing function to support highbitdepth

Change-Id: Ib5de3d1c1acce676b3fcc12b4c237d681ac9a845

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 18045e6..ae69893 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -4639,18 +4639,12 @@
 static uint32_t get_block_residue_hash(MACROBLOCK *x, BLOCK_SIZE bsize) {
   const int rows = block_size_high[bsize];
   const int cols = block_size_wide[bsize];
-  const int diff_stride = cols;
   const struct macroblock_plane *const p = &x->plane[0];
   const int16_t *diff = &p->src_diff[0];
-  uint8_t hash_data[MAX_SB_SQUARE];
-  for (int r = 0; r < rows; ++r) {
-    for (int c = 0; c < cols; ++c) {
-      hash_data[cols * r + c] = clip_pixel(diff[c] + 128);
-    }
-    diff += diff_stride;
-  }
-  return (av1_get_crc_value(&x->tx_rd_record.crc_calculator, hash_data,
-                            rows * cols)
+  uint16_t hash_data[MAX_SB_SQUARE];
+  memcpy(hash_data, diff, sizeof(*hash_data) * rows * cols);
+  return (av1_get_crc_value(&x->tx_rd_record.crc_calculator,
+                            (uint8_t *)hash_data, 2 * rows * cols)
           << 7) +
          bsize;
 }