Merge "Merge CONFIG_COMP_INTER_JOINT_SEARCH." into experimental

configure

@@ -247,7 +247,6 @@ EXPERIMENT_LIST="
     non420
     alpha
     ab4x4
-    comp_inter_joint_search
 "
 CONFIG_LIST="
     external_build

vp9/encoder/vp9_mcomp.c

@@ -414,7 +414,6 @@ int vp9_find_best_sub_pixel_step_iteratively(MACROBLOCK *x,
   return besterr;
 }
 
-#if CONFIG_COMP_INTER_JOINT_SEARCH
 #undef DIST
 /* returns subpixel variance error function */
 #define DIST(r, c) \
@@ -606,7 +605,7 @@ int vp9_find_best_sub_pixel_comp(MACROBLOCK *x,
 
   return besterr;
 }
-#endif  // CONFIG_COMP_INTER_JOINT_SEARCH
+
 
 #undef MVC
 #undef PRE
@@ -2327,7 +2326,6 @@ int vp9_refining_search_sadx4(MACROBLOCK *x,
     return INT_MAX;
 }
 
-#if CONFIG_COMP_INTER_JOINT_SEARCH
 /* This function is called when we do joint motion search in comp_inter_inter
  * mode.
  */
@@ -2429,4 +2427,3 @@ int vp9_refining_search_8p_c(MACROBLOCK *x,
     return INT_MAX;
   }
 }
-#endif  // CONFIG_COMP_INTER_JOINT_SEARCH

vp9/encoder/vp9_mcomp.h

@@ -75,7 +75,6 @@ typedef int (*vp9_diamond_search_fn_t)(MACROBLOCK *x,
                                        int *mvjcost, int *mvcost[2],
                                        int_mv *center_mv);
 
-#if CONFIG_COMP_INTER_JOINT_SEARCH
 int vp9_find_best_sub_pixel_comp(MACROBLOCK *x,
                                  int_mv *bestmv, int_mv *ref_mv,
                                  int error_per_bit,
@@ -91,5 +90,4 @@ int vp9_refining_search_8p_c(MACROBLOCK *x,
                              int *mvjcost, int *mvcost[2],
                              int_mv *center_mv, const uint8_t *second_pred,
                              int w, int h);
-#endif  // CONFIG_COMP_INTER_JOINT_SEARCH
 #endif  // VP9_ENCODER_VP9_MCOMP_H_

vp9/encoder/vp9_onyx_if.c

@@ -778,6 +778,7 @@ void vp9_set_speed_features(VP9_COMP *cpi) {
   sf->optimize_coefficients = !cpi->oxcf.lossless;
   sf->first_step = 0;
   sf->max_step_search_steps = MAX_MVSEARCH_STEPS;
+  sf->comp_inter_joint_serach = 1;
 #if CONFIG_MULTIPLE_ARF
   // Switch segmentation off.
   sf->static_segmentation = 0;
@@ -788,7 +789,6 @@ void vp9_set_speed_features(VP9_COMP *cpi) {
   sf->static_segmentation = 0;
 #endif
 #endif
-  sf->splitmode_breakout = 0;
   sf->mb16_breakout = 0;
 
   switch (mode) {
@@ -807,13 +807,13 @@ void vp9_set_speed_features(VP9_COMP *cpi) {
   sf->static_segmentation = 0;
 #endif
 #endif
-      sf->splitmode_breakout = 1;
       sf->mb16_breakout = 0;
 
       if (speed > 0) {
         /* Disable coefficient optimization above speed 0 */
         sf->optimize_coefficients = 0;
         sf->no_skip_block4x4_search = 0;
+        sf->comp_inter_joint_serach = 0;
 
         sf->first_step = 1;
 

vp9/encoder/vp9_onyx_int.h

@@ -224,9 +224,9 @@ typedef struct {
   int optimize_coefficients;
   int no_skip_block4x4_search;
   int search_best_filter;
-  int splitmode_breakout;
   int mb16_breakout;
   int static_segmentation;
+  int comp_inter_joint_serach;
 } SPEED_FEATURES;
 
 enum BlockSize {

vp9/encoder/vp9_rdopt.c

@@ -2083,7 +2083,7 @@ static int64_t handle_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
       ref_mv[1] = mbmi->ref_mvs[refs[1]][0];
 
       if (is_comp_pred) {
-#if CONFIG_COMP_INTER_JOINT_SEARCH
+        if (cpi->sf.comp_inter_joint_serach) {
           const int b_sz[BLOCK_SIZE_TYPES][2] = {
               {4, 4},
               {8, 8},
@@ -2142,11 +2142,10 @@ static int64_t handle_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
           frame_mv[NEWMV][refs[0]].as_int = single_newmv[refs[0]].as_int;
           frame_mv[NEWMV][refs[1]].as_int = single_newmv[refs[1]].as_int;
 
-        // Allow joint search multiple times iteratively for each ref frame, and
+          // Allow joint search multiple times iteratively for each ref frame
-        // break out the search loop if it couldn't find better mv.
+          // and break out the search loop if it couldn't find better mv.
           for (ite = 0; ite < 4; ite++) {
-          struct buf_2d ref_yv12[2] = {xd->plane[0].pre[0],
+            struct buf_2d ref_yv12[2];
-                                       xd->plane[0].pre[1]};
             int bestsme = INT_MAX;
             int sadpb = x->sadperbit16;
             int_mv tmp_mv;
@@ -2158,6 +2157,10 @@ static int64_t handle_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
             int tmp_row_max = x->mv_row_max;
             int id = ite % 2;
 
+            // Initialized here because of compiler problem in Visual Studio.
+            ref_yv12[0] = xd->plane[0].pre[0];
+            ref_yv12[1] = xd->plane[0].pre[1];
+
             // Get pred block from second frame.
             vp9_build_inter_predictor(ref_yv12[!id].buf,
                                       ref_yv12[!id].stride,
@@ -2233,7 +2236,7 @@ static int64_t handle_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
           }
 
           vpx_free(second_pred);
-#endif  // CONFIG_COMP_INTER_JOINT_SEARCH
+        }
 
         if (frame_mv[NEWMV][refs[0]].as_int == INVALID_MV ||
             frame_mv[NEWMV][refs[1]].as_int == INVALID_MV)

vp9/encoder/vp9_variance.h

@@ -86,7 +86,6 @@ typedef struct vp9_variance_vtable {
     vp9_sad_multi_d_fn_t       sdx4df;
 } vp9_variance_fn_ptr_t;
 
-// #if CONFIG_COMP_INTER_JOINT_SEARCH
 static void comp_avg_pred(uint8_t *comp_pred, const uint8_t *pred, int weight,
                           int height, uint8_t *ref, int ref_stride) {
   int i, j;
@@ -102,5 +101,4 @@ static void comp_avg_pred(uint8_t *comp_pred, const uint8_t *pred, int weight,
     ref += ref_stride;
   }
 }
-// #endif  // CONFIG_COMP_INTER_JOINT_SEARCH
 #endif  // VP9_ENCODER_VP9_VARIANCE_H_