Merge "Patch to remove implicit segmentation." into experimental

diff --cc configure
Simple merge

diff --cc vp9/common/vp9_blockd.h
Simple merge

diff --cc vp9/decoder/vp9_decodframe.c
Simple merge

diff --cc vp9/encoder/vp9_bitstream.c
Simple merge

diff --cc vp9/encoder/vp9_onyx_if.c
index e61d212d73d9ba8474b021c6b33c0974287e7b72,7d5c82d60e01f56b6ce3fc8e8c6fd3592c139975..f0dba737afeb6175a7254b693aa0b2c01a69cc48
--- 1/vp9/encoder/vp9_onyx_if.c
--- 2/vp9/encoder/vp9_onyx_if.c
+++ b/vp9/encoder/vp9_onyx_if.c
@@@ -816,14 -737,52 +756,10 @@@ void vp9_set_speed_features(VP9_COMP *c
  #if CONFIG_MULTIPLE_ARF
        // Switch segmentation off.
        sf->static_segmentation = 0;
- #else
- #if CONFIG_IMPLICIT_SEGMENTATION
-   sf->static_segmentation = 0;
  #else
    sf->static_segmentation = 0;
- #endif
  #endif
        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_search = 0;
 -
 -        sf->first_step = 1;
 -
 -        cpi->mode_check_freq[THR_SPLITG] = 2;
 -        cpi->mode_check_freq[THR_SPLITA] = 2;
 -        cpi->mode_check_freq[THR_SPLITMV] = 0;
 -
 -        cpi->mode_check_freq[THR_COMP_SPLITGA] = 2;
 -        cpi->mode_check_freq[THR_COMP_SPLITLG] = 2;
 -        cpi->mode_check_freq[THR_COMP_SPLITLA] = 0;
 -      }
 -
 -      if (speed > 1) {
 -        cpi->mode_check_freq[THR_SPLITG] = 4;
 -        cpi->mode_check_freq[THR_SPLITA] = 4;
 -        cpi->mode_check_freq[THR_SPLITMV] = 2;
 -
 -        cpi->mode_check_freq[THR_COMP_SPLITGA] = 4;
 -        cpi->mode_check_freq[THR_COMP_SPLITLG] = 4;
 -        cpi->mode_check_freq[THR_COMP_SPLITLA] = 2;
 -      }
 -
 -      if (speed > 2) {
 -        cpi->mode_check_freq[THR_SPLITG] = 15;
 -        cpi->mode_check_freq[THR_SPLITA] = 15;
 -        cpi->mode_check_freq[THR_SPLITMV] = 7;
 -
 -        cpi->mode_check_freq[THR_COMP_SPLITGA] = 15;
 -        cpi->mode_check_freq[THR_COMP_SPLITLG] = 15;
 -        cpi->mode_check_freq[THR_COMP_SPLITLA] = 7;
 -
 -        // Only do recode loop on key frames, golden frames and
 -        // alt ref frames
 -        sf->recode_loop = 2;
 -      }
 -
        break;
  
    }; /* switch */
@@@ -2907,13 -2864,10 +2843,7 @@@ static void encode_frame_to_data_rate(V
        }
      }
  
- #if CONFIG_IMPLICIT_SEGMENTATION
-     if (!cm->error_resilient_mode && !cpi->sf.static_segmentation) {
-       configure_implicit_segmentation(cpi, q);
-     }
- #endif
- 
      // transform / motion compensation build reconstruction frame
 -    if (cm->frame_type == KEY_FRAME) {
 -      vp9_default_coef_probs(cm);
 -    }
  
      vp9_encode_frame(cpi);