From: Ronald S. Bultje <rbultje@google.com>
Date: Tue, 21 Aug 2012 00:04:23 +0000 (-0700)
Subject: Merge "Superblock coding." into experimental
X-Git-Tag: v1.3.0~1217^2~292
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4396441b8b6a97aae50694d49971cdc062c469e0;p=libvpx

Merge "Superblock coding." into experimental
---

4396441b8b6a97aae50694d49971cdc062c469e0
diff --cc vp8/decoder/decodframe.c
index 4b3d36956,61d3c8d2c..1ec4cb17a
--- a/vp8/decoder/decodframe.c
+++ b/vp8/decoder/decodframe.c
@@@ -209,16 -229,16 +229,20 @@@ static void decode_macroblock(VP8D_COM
    MB_PREDICTION_MODE mode;
    int i;
    int tx_type;
+ #if CONFIG_SUPERBLOCKS
+   VP8_COMMON *pc = &pbi->common;
+   int orig_skip_flag = xd->mode_info_context->mbmi.mb_skip_coeff;
+ #endif
  
  #if CONFIG_HYBRIDTRANSFORM
 -  int QIndex = xd->q_index;
 -  int active_ht = (QIndex < ACTIVE_HT);
 +  int QIndex;
 +  int active_ht;
  #endif
  
 +  // re-initialize macroblock dequantizer before detokenization
 +  if (xd->segmentation_enabled)
 +    mb_init_dequantizer(pbi, xd);
 +
    if (pbi->common.frame_type == KEY_FRAME) {
  #if CONFIG_TX16X16
      if (xd->mode_info_context->mbmi.mode <= TM_PRED ||