commit 7122eb9b8f5ad4f6e7c781f2386d99210fb9f413
author Remya <remya.prakasan@ittiam.com> Mon Jan 20 18:16:45 2020 +0530
committer Yunqing Wang <yunqingwang@google.com> Tue Jan 21 18:37:40 2020 +0000
tree aff957d12ccf3e046f4b5d66216b80dc68c9b268
parent 30b91622e7d9cb4965a79de0101abdfaeaf3217e

Abstract best wedge interintra evaluation

Abstracted the evaluation of best wedge interintra mode in
handle_inter_intra_mode function

Change-Id: Ida6c7c1f6f1965fae7736996210f40be8426b1d7

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index bae6418..badfbbf 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -4306,6 +4306,36 @@
   }
 }
 
+// Computes the best wedge interintra mode
+static AOM_INLINE int64_t compute_best_wedge_interintra(
+    const AV1_COMP *const cpi, MB_MODE_INFO *mbmi, MACROBLOCKD *xd,
+    MACROBLOCK *const x, const int *const interintra_mode_cost,
+    const BUFFER_SET *orig_dst, uint8_t *intrapred_, uint8_t *tmp_buf_,
+    int *best_mode, int *best_wedge_index, BLOCK_SIZE bsize) {
+  const AV1_COMMON *const cm = &cpi->common;
+  const int bw = block_size_wide[bsize];
+  int64_t best_interintra_rd_wedge = INT64_MAX;
+  int64_t best_total_rd = INT64_MAX;
+  uint8_t *intrapred = get_buf_by_bd(xd, intrapred_);
+  for (INTERINTRA_MODE mode = 0; mode < INTERINTRA_MODES; ++mode) {
+    mbmi->interintra_mode = mode;
+    av1_build_intra_predictors_for_interintra(cm, xd, bsize, 0, orig_dst,
+                                              intrapred, bw);
+    int64_t rd = pick_interintra_wedge(cpi, x, bsize, intrapred_, tmp_buf_);
+    const int rate_overhead =
+        interintra_mode_cost[mode] +
+        x->wedge_idx_cost[bsize][mbmi->interintra_wedge_index];
+    const int64_t total_rd = rd + RDCOST(x->rdmult, rate_overhead, 0);
+    if (total_rd < best_total_rd) {
+      best_total_rd = total_rd;
+      best_interintra_rd_wedge = rd;
+      *best_mode = mbmi->interintra_mode;
+      *best_wedge_index = mbmi->interintra_wedge_index;
+    }
+  }
+  return best_interintra_rd_wedge;
+}
+
 // Computes the rd_threshold and total_mode_rate
 static AOM_INLINE int64_t compute_total_rate_and_rd_thresh(
     MACROBLOCK *const x, int *rate_mv, int *total_mode_rate, BLOCK_SIZE bsize,
@@ -4418,23 +4448,9 @@
       // Exhaustive search of all wedge and mode combinations.
       int best_mode = 0;
       int best_wedge_index = 0;
-      int64_t best_total_rd = INT64_MAX;
-      for (int j = 0; j < INTERINTRA_MODES; ++j) {
-        mbmi->interintra_mode = (INTERINTRA_MODE)j;
-        av1_build_intra_predictors_for_interintra(cm, xd, bsize, 0, orig_dst,
-                                                  intrapred, bw);
-        rd = pick_interintra_wedge(cpi, x, bsize, intrapred_, tmp_buf_);
-        const int rate_overhead =
-            interintra_mode_cost[mbmi->interintra_mode] +
-            x->wedge_idx_cost[bsize][mbmi->interintra_wedge_index];
-        const int64_t total_rd = rd + RDCOST(x->rdmult, rate_overhead, 0);
-        if (total_rd < best_total_rd) {
-          best_total_rd = total_rd;
-          best_interintra_rd_wedge = rd;
-          best_mode = mbmi->interintra_mode;
-          best_wedge_index = mbmi->interintra_wedge_index;
-        }
-      }
+      best_interintra_rd_wedge = compute_best_wedge_interintra(
+          cpi, mbmi, xd, x, interintra_mode_cost, orig_dst, intrapred_,
+          tmp_buf_, &best_mode, &best_wedge_index, bsize);
       mbmi->interintra_mode = best_mode;
       mbmi->interintra_wedge_index = best_wedge_index;
       if (best_mode != INTERINTRA_MODES - 1) {