commit 9f2c1b072e7587a6a2d16eed6bc2c48a0a02246f
author Remya <remya.prakasan@ittiam.com> Thu Jan 10 15:50:29 2019 +0530
committer Yunqing Wang <yunqingwang@google.com> Thu Jan 10 20:24:27 2019 +0000
tree dbc2155fb5ec757a0bf6e7d50cd7dc31fa5d6559
parent 4806765236102b8b25931a633cceed92034b8cf8

Disable motion search in interinter wedge search

Added a speed feature to disable motion search in interinter wedge search
for newmv cases while speed >= 3.

For speed = 3 and 4 presets, BD-rate drop is seen by 0.03% and 0.03% (as per AWCY runs)
with encode time reduction of 3.4% and 5.3% (averaged across multiple test cases) respectively.

STATS_CHANGED

Change-Id: Ib73724fa983585e5721425efe99c5b32633ea414

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index 2725504..8f86a09 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -7870,7 +7870,8 @@
   // Reuse data if matching record is found
   if (comp_rate[compound_type] == INT_MAX) {
     if (have_newmv_in_inter_mode(this_mode) &&
-        compound_type == COMPOUND_WEDGE) {
+        compound_type == COMPOUND_WEDGE &&
+        !cpi->sf.disable_interinter_wedge_newmv_search) {
       *out_rate_mv = interinter_compound_motion_search(
           cpi, x, cur_mv, bsize, this_mode, mi_row, mi_col);
       av1_build_inter_predictors_sby(cm, xd, mi_row, mi_col, ctx, bsize);

av1/encoder/speed_features.c

diff --git a/av1/encoder/speed_features.c b/av1/encoder/speed_features.c
index 5f3154e..3582838 100644
--- a/av1/encoder/speed_features.c
+++ b/av1/encoder/speed_features.c
@@ -328,6 +328,8 @@
     sf->tx_type_search.prune_mode = PRUNE_2D_FAST;
     sf->gm_search_type = GM_DISABLE_SEARCH;
     sf->prune_comp_search_by_single_result = 2;
+    // TODO(any): evaluate this speed feature for speed 1 & 2.
+    sf->disable_interinter_wedge_newmv_search = 1;
     sf->prune_motion_mode_level = boosted ? 2 : 3;
     sf->prune_warp_using_wmtype = 1;
     // TODO(yunqing): evaluate this speed feature for speed 1 & 2, and combine
@@ -578,6 +580,7 @@
   sf->obmc_full_pixel_search_level = 0;
   sf->skip_sharp_interp_filter_search = 0;
   sf->prune_comp_type_by_comp_avg = 0;
+  sf->disable_interinter_wedge_newmv_search = 0;
   sf->prune_motion_mode_level = 0;
   sf->prune_warp_using_wmtype = 0;
 

av1/encoder/speed_features.h

diff --git a/av1/encoder/speed_features.h b/av1/encoder/speed_features.h
index 95b9def..e2964c8 100644
--- a/av1/encoder/speed_features.h
+++ b/av1/encoder/speed_features.h
@@ -614,6 +614,9 @@
   int skip_obmc_in_uniform_mv_field;
   int skip_wm_in_uniform_mv_field;
 
+  // Enable/disable ME for interinter wedge search.
+  int disable_interinter_wedge_newmv_search;
+
   // skip sharp_filter evaluation based on regular and smooth filter rd for
   // dual_filter=0 case
   int skip_sharp_interp_filter_search;