Merge "Convert coeff to per-plane MACROBLOCK data" into experimental

diff --cc vp9/encoder/vp9_block.h
Simple merge

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

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

diff --cc vp9/encoder/vp9_quantize.c
index a654947da63cacd692a2120970ce19982d9e1444,2ae74543e296b23f6a49926d949b09f830a2173a..a96525a43edd3b298ed9e55e415d07499272a75f
--- 1/vp9/encoder/vp9_quantize.c
--- 2/vp9/encoder/vp9_quantize.c
+++ b/vp9/encoder/vp9_quantize.c
@@@ -151,9 -164,23 +152,11 @@@ void vp9_regular_quantize_b_8x8(MACROBL
                                       pb_idx.block, 16);
    int16_t *dqcoeff_ptr = BLOCK_OFFSET(xd->plane[pb_idx.plane].dqcoeff,
                                        pb_idx.block, 16);
+   int16_t *coeff_ptr = BLOCK_OFFSET(mb->plane[pb_idx.plane].coeff,
+                                     pb_idx.block, 16);
    BLOCK *const b = &mb->block[c_idx];
    BLOCKD *const d = &xd->block[c_idx];
 -  const int *pt_scan;
 -
 -  switch (tx_type) {
 -    case ADST_DCT:
 -      pt_scan = vp9_row_scan_8x8;
 -      break;
 -    case DCT_ADST:
 -      pt_scan = vp9_col_scan_8x8;
 -      break;
 -    default:
 -      pt_scan = vp9_default_zig_zag1d_8x8;
 -      break;
 -  }
 +  const int *pt_scan = get_scan_8x8(tx_type);
  
    if (c_idx == 0) assert(pb_idx.plane == 0);
    if (c_idx == 16) assert(pb_idx.plane == 1);

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