commit 932b7176af7d6ec3d3b115fb9bbe2599ae59aca1
author Sachin Kumar Garg <sachin.kumargarg@ittiam.com> Thu Jan 16 18:24:50 2020 +0530
committer Yunqing Wang <yunqingwang@google.com> Thu Jan 16 18:45:10 2020 +0000
tree c6a9b70e15d267a8a51b3604e7080c727a0160aa
parent 604d050375851a04efac624312aad00a23ee31fc

Simplify bitmask computation in prune_tx_2D

Simplified the for loop structure to compute
allow_bitmask in prune_tx_2D.

Change-Id: I3bb345bf54bc5c425f3319582cf230b2b9680281

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 0cbe595..58979c3 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -1547,29 +1547,29 @@
   // score below score_thresh.
   int max_score_i = 0;
   float max_score = 0.0f;
-  for (int i = 0; i < 16; i++) {
-    if (scores_2D[i] > max_score &&
-        (*allowed_tx_mask & (1 << tx_type_table_2D[i]))) {
-      max_score = scores_2D[i];
-      max_score_i = i;
-    }
-  }
-
   uint16_t allow_bitmask = 0;
   float sum_score = 0.0;
   // Calculate sum of allowed tx type score and Populate allow bit mask based
   // on score_thresh and allowed_tx_mask
   for (int tx_idx = 0; tx_idx < TX_TYPES; tx_idx++) {
     int allow_tx_type = *allowed_tx_mask & (1 << tx_type_table_2D[tx_idx]);
-    if ((scores_2D[tx_idx] >= score_thresh && allow_tx_type) ||
-        tx_idx == max_score_i) {
-      // Set allow mask based on score_thresh and tx type with max score
+    if (scores_2D[tx_idx] > max_score && allow_tx_type) {
+      max_score = scores_2D[tx_idx];
+      max_score_i = tx_idx;
+    }
+    if (scores_2D[tx_idx] >= score_thresh && allow_tx_type) {
+      // Set allow mask based on score_thresh
       allow_bitmask |= (1 << tx_type_table_2D[tx_idx]);
 
       // Accumulate score of allowed tx type
       sum_score += scores_2D[tx_idx];
     }
   }
+  if (!((allow_bitmask >> max_score_i) & 0x01)) {
+    // Set allow mask based on tx type with max score
+    allow_bitmask |= (1 << tx_type_table_2D[max_score_i]);
+    sum_score += scores_2D[max_score_i];
+  }
   // Sort tx type probability of all types
   sort_probability(scores_2D, tx_type_table_2D, TX_TYPES);