Merge "Regrouping code in rd_pick_sb_modes()."

diff --cc vp9/encoder/vp9_encodeframe.c
index 89497290d0375b29a2da64ae51e8e2a0e409d5a4,b10ba3e1ac51b49b358271c89901d073369a64a6..0cc50f71f88723704cca57877488ea1035741b98
--- 1/vp9/encoder/vp9_encodeframe.c
--- 2/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@@ -1010,8 -1013,13 +1010,13 @@@ static void rd_pick_sb_modes(VP9_COMP *
    // Set to zero to make sure we do not use the previous encoded frame stats
    mbmi->skip = 0;
  
 -  x->source_variance = get_sby_perpixel_variance(cpi, x, bsize);
 +  x->source_variance = get_sby_perpixel_variance(cpi, &x->plane[0].src, bsize);
  
+   // Save rdmult before it might be changed, so it can be restored later.
+   orig_rdmult = x->rdmult;
+   if (cpi->oxcf.tuning == VP8_TUNE_SSIM)
+     activity_masking(cpi, x);
+ 
    if (aq_mode == VARIANCE_AQ) {
      const int energy = bsize <= BLOCK_16X16 ? x->mb_energy
                                              : vp9_block_energy(cpi, x, bsize);