From: John Koleszar <jkoleszar@google.com>
Date: Tue, 20 Sep 2011 04:05:04 +0000 (-0400)
Subject: Merge remote branch 'internal/upstream' into HEAD
X-Git-Tag: v1.3.0~1217^2~380^2~191
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=feea724296f02bdd9a32597e42b13decd1a4cd10;p=libvpx

Merge remote branch 'internal/upstream' into HEAD
---

feea724296f02bdd9a32597e42b13decd1a4cd10
diff --cc vp8/decoder/decodframe.c
index cbbcd20f5,4cd370afe..0f4b47463
--- a/vp8/decoder/decodframe.c
+++ b/vp8/decoder/decodframe.c
@@@ -215,30 -191,9 +215,30 @@@ static void decode_macroblock(VP8D_COM
      {
          vp8_reset_mb_tokens_context(xd);
      }
-     else
+     else if (!vp8dx_bool_error(xd->current_bc))
      {
 -        eobtotal = vp8_decode_mb_tokens(pbi, xd);
 +
 +#if CONFIG_T8X8
 +        for(i = 0; i < 25; i++)
 +        {
 +            xd->block[i].eob = 0;
 +            xd->eobs[i] = 0;
 +        }
 +        if (xd->mode_info_context->mbmi.segment_id >= 2)
 +            eobtotal = vp8_decode_mb_tokens_8x8(pbi, xd);
 +        else
 +#endif
 +            eobtotal = vp8_decode_mb_tokens(pbi, xd);
 +#ifdef DEC_DEBUG
 +        if (dec_debug) {
 +            printf("\nTokens (%d)\n", eobtotal);
 +            for (i =0; i<400; i++) {
 +                printf("%3d ", xd->qcoeff[i]);
 +                if (i%16 == 15) printf("\n");
 +            }
 +            printf("\n");
 +        }
 +#endif
      }
  
      /* Perform temporary clamping of the MV to be used for prediction */