Merge remote branch 'internal/upstream-experimental' into HEAD

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

Change-Id: I4becf6f101756923de6b98ca6a2132c3605c6ea5

diff --cc vp8/common/blockd.h
Simple merge

diff --cc vp8/decoder/decodemv.c
Simple merge

diff --cc vp8/decoder/decodframe.c
Simple merge

diff --cc vp8/decoder/onyxd_if.c
Simple merge

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

diff --cc vp8/encoder/encodeframe.c
index aa88151c08ca9f413b141c3b7634d0d4f0c9623d,c725cd023a415856fa096047e90dca677f5105ee..56af2d16b854c38cd8e46a85169454835e50c502
--- 1/vp8/encoder/encodeframe.c
--- 2/vp8/encoder/encodeframe.c
+++ b/vp8/encoder/encodeframe.c
@@@ -488,13 -477,24 +488,29 @@@ void encode_mb_row(VP8_COMP *cpi
          x->mb_activity_ptr++;
          x->mb_norm_activity_ptr++;
  
-         for (i = 0; i < 16; i++)
-             vpx_memcpy(&xd->mode_info_context->bmi[i], &xd->block[i].bmi, sizeof(xd->block[i].bmi));
 +        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;
 +
+         if(cm->frame_type != INTRA_FRAME)
+         {
+             if (xd->mode_info_context->mbmi.mode != B_PRED)
+             {
+                 for (i = 0; i < 16; i++)
+                     xd->mode_info_context->bmi[i].mv.as_int = xd->block[i].bmi.mv.as_int;
+             }else
+             {
+                 for (i = 0; i < 16; i++)
+                     xd->mode_info_context->bmi[i].as_mode = xd->block[i].bmi.mode;
+             }
+         }
+         else
+         {
+             if(xd->mode_info_context->mbmi.mode != B_PRED)
+                 for (i = 0; i < 16; i++)
+                     xd->mode_info_context->bmi[i].as_mode = xd->block[i].bmi.mode;
+         }
  
          // adjust to the next column of macroblocks
          x->src.y_buffer += 16;