commit 79caf53d24f96773dbdbff9d8bf9d136e50b3c93
author Lokeshwar  Reddy B <lokeshwar.reddy@ittiam.com> Thu Jul 04 11:11:50 2019 +0530
committer Yunqing Wang <yunqingwang@google.com> Tue Jul 09 22:11:08 2019 +0000
tree 9fdcb61f24c642b58c360e9b34e5d1a5fc35cd3f
parent bf0b45a089d8b775236b3ab3a7cfc3d78dda39c1

Fix issues related to adaptive rd thresh

         Encode Time      Quality Impact(%)
Preset    reduction(%)        (AWCY)
  2          0.48            0.00
  3          1.29            0.07
  4          1.06            0.04

STATS_CHANGED

Change-Id: I00fe62bf17a65d9093981c1c5cff64dd8f4bb4d6

av1/encoder/rd.c

diff --git a/av1/encoder/rd.c b/av1/encoder/rd.c
index 0e18b88..91a912d 100644
--- a/av1/encoder/rd.c
+++ b/av1/encoder/rd.c
@@ -1322,10 +1322,17 @@
   if (rd_thresh > 0) {
     const int top_mode = MAX_MODES;
     int mode;
+    BLOCK_SIZE min_size;
+    BLOCK_SIZE max_size;
+    if (bsize <= cm->seq_params.sb_size) {
+      min_size = AOMMAX(bsize - 1, BLOCK_4X4);
+      max_size = AOMMIN(bsize + 2, (int)cm->seq_params.sb_size);
+    } else {
+      // TODO(any): Experiment with threshold update for parent/child blocks
+      min_size = bsize;
+      max_size = bsize;
+    }
     for (mode = 0; mode < top_mode; ++mode) {
-      const BLOCK_SIZE min_size = AOMMAX(bsize - 1, BLOCK_4X4);
-      const BLOCK_SIZE max_size =
-          AOMMIN(bsize + 2, (int)cm->seq_params.sb_size);
       BLOCK_SIZE bs;
       for (bs = min_size; bs <= max_size; ++bs) {
         int *const fact = &factor_buf[bs][mode];