commit b0f6bd44ae4b1e1fc29a7cc1ea813d39e5e03bea
author Debargha Mukherjee <debargha@google.com> Fri Dec 02 09:19:39 2016 -0800
committer Debargha Mukherjee <debargha@google.com> Fri Dec 09 01:35:38 2016 +0000
tree 2a38a4077a332b969c7d6890f83891be98846397
parent 91ad0e8b836f25f2b07216d28f32561b99954c6f

Support affine/homography models for global motion

With this patch affine or homography models can be enabled
by simply changing the value of the GLOBAL_TRANS_TYPES
macro in common/mv.h to 4 and 5 respectively. Currently
it is left at supporting only rotzoom. There is a small
gain with enabling affine.

Also refactors costing to change based on the model type.

Change-Id: I46c1759de06c42c176c64ec21307ff347ddcc259

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index b7faf03..3b62c1c 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -4333,29 +4333,22 @@
 #endif  // CONFIG_EXT_INTER
 
 #if CONFIG_GLOBAL_MOTION
-#define GLOBAL_MOTION_COST_AMORTIZATION_BLKS 8
-
-#if GLOBAL_MOTION_COST_AMORTIZATION_BLKS > 0
-static int get_gmbitcost(const AV1_COMP *const cpi,
-                         const WarpedMotionParams *gm) {
+static int GLOBAL_MOTION_RATE(const AV1_COMP *const cpi, int ref) {
+  static const int gm_amortization_blks[TRANS_TYPES] = { 4, 6, 8, 10, 12 };
   static const int gm_params_cost[TRANS_TYPES] = {
     GM_IDENTITY_BITS, GM_TRANSLATION_BITS, GM_ROTZOOM_BITS,
     GM_AFFINE_BITS,   GM_HOMOGRAPHY_BITS,
   };
-  const int cost = (gm_params_cost[gm->wmtype] << AV1_PROB_COST_SHIFT) +
-                   cpi->gmtype_cost[gm->wmtype];
+  const WarpedMotionParams *gm = &cpi->common.global_motion[(ref)];
   assert(gm->wmtype < GLOBAL_TRANS_TYPES);
-  return cost;
+  if (cpi->global_motion_used[ref] >= gm_amortization_blks[gm->wmtype]) {
+    return 0;
+  } else {
+    const int cost = (gm_params_cost[gm->wmtype] << AV1_PROB_COST_SHIFT) +
+                     cpi->gmtype_cost[gm->wmtype];
+    return cost / gm_amortization_blks[gm->wmtype];
+  }
 }
-
-#define GLOBAL_MOTION_RATE(ref)                                         \
-  (cpi->global_motion_used[ref] >= GLOBAL_MOTION_COST_AMORTIZATION_BLKS \
-       ? 0                                                              \
-       : get_gmbitcost(cpi, &cm->global_motion[(ref)]) /                \
-             GLOBAL_MOTION_COST_AMORTIZATION_BLKS)
-#else
-#define GLOBAL_MOTION_RATE(ref) 0
-#endif  // GLOBAL_MOTION_COST_AMORTIZATION_BLKS > 0
 #endif  // CONFIG_GLOBAL_MOTION
 
 static int set_and_cost_bmi_mvs(const AV1_COMP *const cpi, MACROBLOCK *x,
@@ -4369,9 +4362,6 @@
 #endif  // CONFIG_EXT_INTER
                                 int_mv *best_ref_mv[2], const int *mvjcost,
                                 int *mvcost[2]) {
-#if CONFIG_GLOBAL_MOTION
-  const AV1_COMMON *cm = &cpi->common;
-#endif  // CONFIG_GLOBAL_MOTION
   MODE_INFO *const mic = xd->mi[0];
   const MB_MODE_INFO *const mbmi = &mic->mbmi;
   const MB_MODE_INFO_EXT *const mbmi_ext = x->mbmi_ext;
@@ -4427,13 +4417,13 @@
           gm_get_motion_vector(&cpi->common.global_motion[mbmi->ref_frame[0]],
                                cpi->common.allow_high_precision_mv)
               .as_int;
-      thismvcost += GLOBAL_MOTION_RATE(mbmi->ref_frame[0]);
+      thismvcost += GLOBAL_MOTION_RATE(cpi, mbmi->ref_frame[0]);
       if (is_compound) {
         this_mv[1].as_int =
             gm_get_motion_vector(&cpi->common.global_motion[mbmi->ref_frame[1]],
                                  cpi->common.allow_high_precision_mv)
                 .as_int;
-        thismvcost += GLOBAL_MOTION_RATE(mbmi->ref_frame[1]);
+        thismvcost += GLOBAL_MOTION_RATE(cpi, mbmi->ref_frame[1]);
       }
 #else   // CONFIG_GLOBAL_MOTION
       this_mv[0].as_int = 0;
@@ -8059,9 +8049,9 @@
 #endif  // CONFIG_MOTION_VAR || CONFIG_WARPED_MOTION
 #if CONFIG_GLOBAL_MOTION
     if (this_mode == ZEROMV) {
-      rd_stats->rate += GLOBAL_MOTION_RATE(mbmi->ref_frame[0]);
+      rd_stats->rate += GLOBAL_MOTION_RATE(cpi, mbmi->ref_frame[0]);
       if (is_comp_pred)
-        rd_stats->rate += GLOBAL_MOTION_RATE(mbmi->ref_frame[1]);
+        rd_stats->rate += GLOBAL_MOTION_RATE(cpi, mbmi->ref_frame[1]);
     }
 #endif  // CONFIG_GLOBAL_MOTION