Merge remote branch 'origin/master' into experimental

Conflicts:
	vp8/encoder/encodeframe.c
	vp8/encoder/rdopt.c

Change-Id: I8bab720889ac652361abdedfe2cc91a89742cb30

diff --cc vp8/encoder/encodeframe.c
index 5372f8d,892284e..5834e6f
--- 1/vp8/encoder/encodeframe.c
--- 2/vp8/encoder/encodeframe.c
+++ b/vp8/encoder/encodeframe.c
@@@ -582,81 -722,30 +722,28 @@@ void vp8_encode_frame(VP8_COMP *cpi
      cpi->last_mb_distortion = 0;
  #endif
  
-     totalrate = 0;
- 
-     x->partition_info = x->pi;
- 
      xd->mode_info_context = cm->mi;
-     xd->mode_info_stride = cm->mode_info_stride;
- 
-     xd->frame_type = cm->frame_type;
  
-     xd->frames_since_golden = cm->frames_since_golden;
-     xd->frames_till_alt_ref_frame = cm->frames_till_alt_ref_frame;
      vp8_zero(cpi->MVcount);
-     // vp8_zero( Contexts)
      vp8_zero(cpi->coef_counts);
  
-     // reset intra mode contexts
-     if (cm->frame_type == KEY_FRAME)
-         vp8_init_mbmode_probs(cm);
- 
- 
      vp8cx_frame_init_quantizer(cpi);
  
-     if (cpi->compressor_speed == 2)
-     {
-         if (cpi->oxcf.cpu_used < 0)
-             cpi->Speed = -(cpi->oxcf.cpu_used);
-         else
-             vp8_auto_select_speed(cpi);
-     }
 -    vp8_initialize_rd_consts(cpi,
 -                             vp8_dc_quant(cm->base_qindex, cm->y1dc_delta_q));
--
 +    vp8_initialize_rd_consts(cpi, cm->base_qindex + cm->y1dc_delta_q);
      vp8cx_initialize_me_consts(cpi, cm->base_qindex);
  
-     // Copy data over into macro block data sturctures.
-     x->src = * cpi->Source;
-     xd->pre = cm->yv12_fb[cm->lst_fb_idx];
-     xd->dst = cm->yv12_fb[cm->new_fb_idx];
- 
-     // set up frame new frame for intra coded blocks
- 
-     vp8_setup_intra_recon(&cm->yv12_fb[cm->new_fb_idx]);
- 
-     vp8_build_block_offsets(x);
- 
-     vp8_setup_block_dptrs(&x->e_mbd);
- 
-     vp8_setup_block_ptrs(x);
- 
-     xd->mode_info_context->mbmi.mode = DC_PRED;
-     xd->mode_info_context->mbmi.uv_mode = DC_PRED;
- 
-     xd->left_context = &cm->left_context;
- 
-     vp8_zero(cpi->count_mb_ref_frame_usage)
-     vp8_zero(cpi->ymode_count)
-     vp8_zero(cpi->uv_mode_count)
- 
-     x->mvc = cm->fc.mvc;
- 
-     vpx_memset(cm->above_context, 0, sizeof(ENTROPY_CONTEXT_PLANES) * cm->mb_cols);
- 
      if(cpi->oxcf.tuning == VP8_TUNE_SSIM)
      {
-         if(1)
-         {
-             // Build a frame level activity map
-             build_activity_map(cpi);
-         }
+         // Initialize encode frame context.
+         init_encode_frame_mb_context(cpi);
  
-         // Reset various MB pointers.
-         x->src = *cpi->Source;
-         x->mb_activity_ptr = cpi->mb_activity_map;
-         x->mb_norm_activity_ptr = cpi->mb_norm_activity_map;
+         // Build a frame level activity map
+         build_activity_map(cpi);
      }
  
+     // re-initencode frame context.
+     init_encode_frame_mb_context(cpi);
+ 
      {
          struct vpx_usec_timer  emr_timer;
          vpx_usec_timer_start(&emr_timer);

diff --cc vp8/encoder/firstpass.c
Simple merge

diff --cc vp8/encoder/generic/csystemdependent.c
Simple merge

diff --cc vp8/encoder/onyx_if.c
Simple merge

diff --cc vp8/encoder/ratectrl.c
Simple merge

diff --cc vp8/encoder/rdopt.c
index 3186fa6,5ce61a0..cd250c4
--- 1/vp8/encoder/rdopt.c
--- 2/vp8/encoder/rdopt.c
+++ b/vp8/encoder/rdopt.c
@@@ -240,15 -197,11 +240,15 @@@ static int sad_per_bit4lut[QINDEX_RANGE
  
  void vp8cx_initialize_me_consts(VP8_COMP *cpi, int QIndex)
  {
-     cpi->mb.sadperbit16 =  sad_per_bit16lut[QIndex]/2;
-     cpi->mb.sadperbit4  =  sad_per_bit4lut[QIndex]/2;
+     cpi->mb.sadperbit16 =  sad_per_bit16lut[QIndex];
+     cpi->mb.sadperbit4  =  sad_per_bit4lut[QIndex];
  }
  
 -void vp8_initialize_rd_consts(VP8_COMP *cpi, int Qvalue)
 +
 +
 +
 +
 +void vp8_initialize_rd_consts(VP8_COMP *cpi, int QIndex)
  {
      int q;
      int i;