Disable masked compound at speed 6

Disabled masked compound for >= 720p videos at speed 6. It seemed better
speed/quality tradeoff was achieved for >= HD resolutions.

Borg test result at speed 6:
       avg_psnr:  ovr_psnr:  ssim:   avg speed change:
hdres:   0.347    0.355      0.146       3.6%

STATS_CHANGED

Change-Id: Ifa15fcb1a762cbe16bdef8e17b7c3756e3a95f10
diff --git a/av1/encoder/speed_features.c b/av1/encoder/speed_features.c
index 4b32259..b1318e2 100644
--- a/av1/encoder/speed_features.c
+++ b/av1/encoder/speed_features.c
@@ -247,6 +247,10 @@
     if (is_1080p_or_larger) {
       sf->part_sf.default_min_partition_size = BLOCK_8X8;
     }
+
+    if (is_720p_or_larger) {
+      sf->inter_sf.disable_masked_comp = 1;
+    }
   }
 }
 
@@ -1038,6 +1042,7 @@
   inter_sf->reuse_compound_type_decision = 0;
   inter_sf->txfm_rd_gate_level = 0;
   inter_sf->prune_inter_modes_if_skippable = 0;
+  inter_sf->disable_masked_comp = 0;
 }
 
 static AOM_INLINE void init_interp_sf(INTERP_FILTER_SPEED_FEATURES *interp_sf) {
@@ -1202,6 +1207,9 @@
     cpi->common.seq_params.enable_dual_filter &=
         !sf->interp_sf.disable_dual_filter;
     cpi->common.seq_params.enable_restoration &= !sf->lpf_sf.disable_lr_filter;
+
+    cpi->common.seq_params.enable_masked_compound &=
+        !sf->inter_sf.disable_masked_comp;
   }
 
   // sf->part_sf.partition_search_breakout_dist_thr is set assuming max 64x64
diff --git a/av1/encoder/speed_features.h b/av1/encoder/speed_features.h
index 53aeed2..09bf5cc 100644
--- a/av1/encoder/speed_features.h
+++ b/av1/encoder/speed_features.h
@@ -675,6 +675,9 @@
   // 0: No reuse
   // 1: Reuse the compound type decision
   int reuse_compound_type_decision;
+
+  // Enable/disable masked compound.
+  int disable_masked_comp;
 } INTER_MODE_SPEED_FEATURES;
 
 typedef struct INTERP_FILTER_SPEED_FEATURES {