commit 9104bedbfc9896d263406edbff200152b42b2b02
author Jingning Han <jingning@google.com> Wed Dec 14 09:38:00 2016 -0800
committer Jingning Han <jingning@google.com> Wed Dec 14 22:48:53 2016 +0000
tree 99cdd83c4c7dd54d78113beea098a91ac67156f1
parent c1c502b85b8bd38188f9232a781fecf572c7c0ca

Unify rd_cost threshold for all block sizes

Use same process for both sub8x8 and regular block sizes.

Change-Id: I8fab4c738604c8e7780b0ec5299abcb403fbc0b7

av1/encoder/rd.c

diff --git a/av1/encoder/rd.c b/av1/encoder/rd.c
index fb4960d..078c33b 100644
--- a/av1/encoder/rd.c
+++ b/av1/encoder/rd.c
@@ -319,6 +319,12 @@
       const int t = q * rd_thresh_block_size_factor[bsize];
       const int thresh_max = INT_MAX / t;
 
+#if CONFIG_CB4X4
+      for (i = 0; i < MAX_MODES; ++i)
+        rd->threshes[segment_id][bsize][i] = rd->thresh_mult[i] < thresh_max
+                                                 ? rd->thresh_mult[i] * t / 4
+                                                 : INT_MAX;
+#else
       if (bsize >= BLOCK_8X8) {
         for (i = 0; i < MAX_MODES; ++i)
           rd->threshes[segment_id][bsize][i] = rd->thresh_mult[i] < thresh_max
@@ -331,6 +337,7 @@
                   ? rd->thresh_mult_sub8x8[i] * t / 4
                   : INT_MAX;
       }
+#endif
     }
   }
 }
@@ -1152,7 +1159,11 @@
                                int (*factor_buf)[MAX_MODES], int rd_thresh,
                                int bsize, int best_mode_index) {
   if (rd_thresh > 0) {
+#if CONFIG_CB4X4
+    const int top_mode = MAX_MODES;
+#else
     const int top_mode = bsize < BLOCK_8X8 ? MAX_REFS : MAX_MODES;
+#endif
     int mode;
     for (mode = 0; mode < top_mode; ++mode) {
       const BLOCK_SIZE min_size = AOMMAX(bsize - 1, BLOCK_4X4);