From: Scott LaVarnway <slavarnway@google.com>
Date: Thu, 25 Apr 2013 15:53:42 +0000 (-0700)
Subject: Merge "Moved dequantization into the token decoder" into experimental
X-Git-Tag: v1.3.0~1106^2~147
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a426c7f343603c545e85a8ee1426e10b672297ef;p=libvpx

Merge "Moved dequantization into the token decoder" into experimental
---

a426c7f343603c545e85a8ee1426e10b672297ef
diff --cc vp9/decoder/vp9_decodframe.c
index a51c82853,c962729fd..ac1c14672
--- a/vp9/decoder/vp9_decodframe.c
+++ b/vp9/decoder/vp9_decodframe.c
@@@ -313,15 -323,12 +305,12 @@@ static void decode_8x8(MACROBLOCKD *xd
  
  static INLINE void dequant_add_y(MACROBLOCKD *xd, TX_TYPE tx_type, int idx) {
    BLOCKD *const b = &xd->block[idx];
 -  struct mb_plane *const y = &xd->plane[0];
 +  struct macroblockd_plane *const y = &xd->plane[0];
    if (tx_type != DCT_DCT) {
-     vp9_dequant_iht_add_c(tx_type,
-                           BLOCK_OFFSET(y->qcoeff, idx, 16),
-                           b->dequant, *(b->base_dst) + b->dst,
-                           b->dst_stride, y->eobs[idx]);
+     vp9_iht_add_c(tx_type, BLOCK_OFFSET(y->qcoeff, idx, 16),
+                   *(b->base_dst) + b->dst, b->dst_stride, y->eobs[idx]);
    } else {
-     xd->itxm_add(BLOCK_OFFSET(y->qcoeff, idx, 16),
-                  b->dequant, *(b->base_dst) + b->dst,
+     xd->itxm_add(BLOCK_OFFSET(y->qcoeff, idx, 16), *(b->base_dst) + b->dst,
                   b->dst_stride, y->eobs[idx]);
    }
  }
diff --cc vp9/decoder/vp9_detokenize.c
index 02ee7c3d6,7519108c5..3099b9376
--- a/vp9/decoder/vp9_detokenize.c
+++ b/vp9/decoder/vp9_detokenize.c
@@@ -79,13 -64,24 +79,13 @@@ DECLARE_ALIGNED(16, extern const uint8_
    do {                                       \
      coef_counts[type][ref][get_coef_band(scan, txfm_size, c)] \
                 [pt][token]++;     \
 -    token_cache[c] = token; \
 -    pt = vp9_get_coef_context(scan, nb, pad, token_cache,     \
 -                              c + 1, default_eob); \
 +    token_cache[scan[c]] = token; \
    } while (0)
 +#endif
  
 -#if CONFIG_CODE_NONZEROCOUNT
 -#define WRITE_COEF_CONTINUE(val, token)                       \
 -  {                                                           \
 -    qcoeff_ptr[scan[c]] = vp9_read_and_apply_sign(r, val);    \
 -    INCREMENT_COUNT(token);                                   \
 -    c++;                                                      \
 -    nzc++;                                                    \
 -    continue;                                                 \
 -  }
 -#else
  #define WRITE_COEF_CONTINUE(val, token)                  \
    {                                                      \
-     qcoeff_ptr[scan[c]] = vp9_read_and_apply_sign(r, val); \
+     qcoeff_ptr[scan[c]] = vp9_read_and_apply_sign(r, val) * dq[c > 0]; \
      INCREMENT_COUNT(token);                              \
      c++;                                                 \
      continue;                                            \