commit e96a759b31b74618b8cc671ee809ec97732cf63e
author Jayasanker J <jayasanker.j@ittiam.com> Mon Mar 23 15:22:45 2020 +0530
committer Yunqing Wang <yunqingwang@google.com> Mon Mar 23 18:18:09 2020 +0000
tree 19ff182fe24545c3a846d3c03fa22ca1a8c04682
parent 7026d4b9f1d6f67649d054e9c9080e9294da1c44

Clip threshold for Qindex 0 in AB, 4partition pruning

The num_win_thresh for AB and 1:4/4:1 partition pruning
have been clipped appropriately to eliminate unnecessary
pruning for Qindex=0 cases.

Change-Id: Ic0bf1ea1a3f5e1714ee32fd588f1020033fa0ab8

av1/encoder/encodeframe.c

diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index ab8d818..1bad88f 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -2599,7 +2599,7 @@
   int num_win = 0;
   // Threshold for number of winners
   // Conservative pruning for high quantizers
-  int num_win_thresh = 3 * (2 * (MAXQ - qindex) / MAXQ);
+  const int num_win_thresh = AOMMIN(3 * (2 * (MAXQ - qindex) / MAXQ), 3);
   bool sub_part_win = (rect_part_win_info == NULL)
                           ? (pc_tree->partitioning == rect_part)
                           : (rect_part == PARTITION_HORZ)
@@ -3633,7 +3633,7 @@
     // Prune HORZ4/VERT4 partitions based on number of HORZ/VERT winners of
     // split partiitons.
     // Conservative pruning for high quantizers
-    const int num_win_thresh = 3 * (MAXQ - x->qindex) / MAXQ + 1;
+    const int num_win_thresh = AOMMIN(3 * (MAXQ - x->qindex) / MAXQ + 1, 3);
     if (num_child_horz_win < num_win_thresh) {
       partition_horz4_allowed = 0;
     }