commit de80e7649d5d6574308852a3038e5835adcfcb4f
author Debargha Mukherjee <debargha@google.com> Thu Nov 30 13:58:56 2017 -0800
committer Debargha Mukherjee <debargha@google.com> Fri Dec 01 02:34:50 2017 +0000
tree e3a2d929a01cfcd8a51f47192f6786385a95caca
parent 14965eddae70908f7a16f89c0d0acc3f1fa6c601

Small rd fixes

1. Turns off hash based rd for rectangular blocks temporarily.
2. A small fix for zero_rate aggregation.

Change-Id: I571e5b2b5441cc0d1b8b0a522d9ab23787441103

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 55010c2..0b23aba 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -4534,12 +4534,12 @@
                                              x->tx_size_rd_record_32X32 };
 #endif
   const TX_SIZE max_square_tx_size = max_txsize_lookup[bsize];
-
-  // Hashing is performed only for square TX sizes larger than TX_4X4
-  if (max_square_tx_size < TX_8X8) return 0;
-
   const int bw = block_size_wide[bsize];
   const int bh = block_size_high[bsize];
+
+  // Hashing is performed only for square TX sizes larger than TX_4X4
+  if (max_square_tx_size < TX_8X8 || bw != bh) return 0;
+
   const int diff_stride = bw;
   const struct macroblock_plane *const p = &x->plane[0];
   const int16_t *diff = &p->src_diff[0];