commit 9666276accea505cd14cbcb9e3f7ff5033da9172
author chiyotsai <chiyotsai@google.com> Fri Aug 09 12:14:34 2019 -0700
committer Chi Yo Tsai <chiyotsai@google.com> Fri Aug 09 23:44:36 2019 +0000
tree b4bfb743436016c8846b61f07d2d8c0c27e5e1fa
parent 2d82abf6aa5e7e085d7f72f4f2d80fce2151dbf8

Clean up code for hash-me

Change-Id: I6f724b2914ed7cfbea22f69bbac170adc4eeb68e

av1/encoder/mcomp.c

diff --git a/av1/encoder/mcomp.c b/av1/encoder/mcomp.c
index 00ce953..93b088b 100644
--- a/av1/encoder/mcomp.c
+++ b/av1/encoder/mcomp.c
@@ -2392,6 +2392,7 @@
   if (method != NSTEP && rd && var < var_max)
     var = av1_get_mvpred_var(x, &x->best_mv.as_mv, ref_mv, fn_ptr, 1);
 
+  // Use hash-me for intrablock copy
   do {
     if (!intra || !av1_use_hash_me(&cpi->common)) break;
 
@@ -2409,10 +2410,7 @@
         int best_hash_cost = INT_MAX;
 
         // for the hashMap
-        hash_table *ref_frame_hash =
-            intra ? &cpi->common.cur_frame->hash_table
-                  : av1_get_ref_frame_hash_map(&cpi->common,
-                                               x->e_mbd.mi[0]->ref_frame[0]);
+        hash_table *ref_frame_hash = &cpi->common.cur_frame->hash_table;
 
         av1_get_block_hash_value(what, what_stride, block_width, &hash_value1,
                                  &hash_value2, is_cur_buf_hbd(&x->e_mbd), x);