Revert "Extend joint motion search range"

Revert submission 122484
STATS_CHANGED

Reason for revert: These patches were created for testing. It does not seem like a good trade-off in terms of computation vs. coding-gain.
Reverted Changes:

Ibf752e7c6:Extend joint motion search range
I55faaa020:Enable one-sided motion search to account for join...
I9555515db:Allow jnt motion search

Change-Id: I1784a043479dcd1874ed00ed1371ac15fd528657

av1/encoder/mcomp.c

diff --git a/av1/encoder/mcomp.c b/av1/encoder/mcomp.c
index 5eff5bf..70cfbf7 100644
--- a/av1/encoder/mcomp.c
+++ b/av1/encoder/mcomp.c
@@ -1627,6 +1627,10 @@
     MARK_MV_INVALID(second_best_mv);
   }
 
+  assert(ms_params->ms_buffers.second_pred == NULL &&
+         ms_params->ms_buffers.mask == NULL &&
+         "av1_full_pixel_search does not support compound pred");
+
   if (cost_list) {
     cost_list[0] = INT_MAX;
     cost_list[1] = INT_MAX;

av1/encoder/motion_search_facade.c

diff --git a/av1/encoder/motion_search_facade.c b/av1/encoder/motion_search_facade.c
index 3387731..eac0e4e 100644
--- a/av1/encoder/motion_search_facade.c
+++ b/av1/encoder/motion_search_facade.c
@@ -422,10 +422,8 @@
 
     // Make motion search params
     FULLPEL_MOTION_SEARCH_PARAMS full_ms_params;
-    const search_site_config *src_search_sites =
-        cpi->mv_search_params.search_site_cfg[SS_CFG_SRC];
     av1_make_default_fullpel_ms_params(&full_ms_params, cpi, x, bsize,
-                                       &ref_mv[id].as_mv, src_search_sites,
+                                       &ref_mv[id].as_mv, NULL,
                                        /*fine_search_interval=*/0);
 
     av1_set_ms_compound_refs(&full_ms_params.ms_buffers, second_pred, mask,
@@ -435,8 +433,8 @@
     const FULLPEL_MV start_fullmv = get_fullmv_from_mv(&cur_mv[id].as_mv);
 
     // Small-range full-pixel motion search.
-    bestsme = av1_full_pixel_search(start_fullmv, &full_ms_params, 5, NULL,
-                                    &best_mv.as_fullmv, NULL);
+    bestsme = av1_refining_search_8p_c(&full_ms_params, start_fullmv,
+                                       &best_mv.as_fullmv);
 
     // Restore the pointer to the first (possibly scaled) prediction buffer.
     if (id) xd->plane[plane].pre[0] = ref_yv12[0];
@@ -544,10 +542,8 @@
 
   // Make motion search params
   FULLPEL_MOTION_SEARCH_PARAMS full_ms_params;
-  const search_site_config *src_search_sites =
-      cpi->mv_search_params.search_site_cfg[SS_CFG_SRC];
   av1_make_default_fullpel_ms_params(&full_ms_params, cpi, x, bsize,
-                                     &ref_mv.as_mv, src_search_sites,
+                                     &ref_mv.as_mv, NULL,
                                      /*fine_search_interval=*/0);
 
   av1_set_ms_compound_refs(&full_ms_params.ms_buffers, second_pred, mask,
@@ -557,8 +553,8 @@
   const FULLPEL_MV start_fullmv = get_fullmv_from_mv(this_mv);
 
   // Small-range full-pixel motion search.
-  bestsme = av1_full_pixel_search(start_fullmv, &full_ms_params, 5, NULL,
-                                  &best_mv.as_fullmv, NULL);
+  bestsme = av1_refining_search_8p_c(&full_ms_params, start_fullmv,
+                                     &best_mv.as_fullmv);
 
   if (scaled_ref_frame) {
     // Swap back the original buffers for subpel motion search.