From: John Koleszar <jkoleszar@google.com>
Date: Wed, 24 Apr 2013 00:41:59 +0000 (-0700)
Subject: Merge "Convert coeff to per-plane MACROBLOCK data" into experimental
X-Git-Tag: v1.3.0~1106^2~164
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aa6a36b06290d68928d38fc8648b2072f51543e9;p=libvpx

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

aa6a36b06290d68928d38fc8648b2072f51543e9
diff --cc vp9/encoder/vp9_quantize.c
index a654947da,2ae74543e..a96525a43
--- a/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);