Merge remote branch 'internal/upstream' into HEAD

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

Change-Id: I3c66714e704b22569aff701cc5b9b2a5b70989f3

diff --cc vp8/encoder/encodeframe.c
index 98897371111dd33debeb4313275f4fc0be3e6e55,b7b462157808b8ab244c6407dbc0866dbb2bad45..fb0856ca96cd239bf60caa64ab94b0da25942c32
--- 1/vp8/encoder/encodeframe.c
--- 2/vp8/encoder/encodeframe.c
+++ b/vp8/encoder/encodeframe.c
@@@ -486,11 -683,8 +691,11 @@@ void encode_mb_row(VP8_COMP *cpi
      int dst_fb_idx = cm->new_fb_idx;
      int recon_y_stride = cm->yv12_fb[ref_fb_idx].y_stride;
      int recon_uv_stride = cm->yv12_fb[ref_fb_idx].uv_stride;
-     int seg_map_index = (mb_row * cpi->common.mb_cols);
+     int map_index = (mb_row * cpi->common.mb_cols);
 -
 +#if CONFIG_SEGMENTATION
 +    int left_id, above_id;
 +    int sum;
 +#endif
  #if CONFIG_MULTITHREAD
      const int nsync = cpi->mt_sync_range;
      const int rightmost_col = cm->mb_cols - 1;
@@@ -636,13 -834,13 +845,18 @@@
  
          cpi->tplist[mb_row].stop = *tp;
  
-         x->gf_active_ptr++;      // Increment pointer into gf useage flags structure for next mb
+         // Increment pointer into gf useage flags structure.
+         x->gf_active_ptr++;
+ 
+         // Increment the activity mask pointers.
+         x->mb_activity_ptr++;
+         x->mb_norm_activity_ptr++;
  
 +        if ((xd->mode_info_context->mbmi.mode == ZEROMV) && (xd->mode_info_context->mbmi.ref_frame == LAST_FRAME))
 +            xd->mode_info_context->mbmi.segment_id = 0;
 +        else
 +            xd->mode_info_context->mbmi.segment_id = 1;
 +
          for (i = 0; i < 16; i++)
              vpx_memcpy(&xd->mode_info_context->bmi[i], &xd->block[i].bmi, sizeof(xd->block[i].bmi));
  
@@@ -713,7 -878,7 +927,6 @@@
      // this is to account for the border
      xd->mode_info_context++;
      x->partition_info++;
-     x->activity_sum += activity_sum;
 -
  #if CONFIG_MULTITHREAD
      if ((cpi->b_multi_threaded != 0) && (mb_row == cm->mb_rows - 1))
      {

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

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

diff --cc vp8/encoder/onyx_int.h
Simple merge