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

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

8f6018650293dd43e1154258ff6fb1c150889556
diff --cc vp8/decoder/decodframe.c
index c6cea3a52,ddb09703b..a1aa1ec8a
--- a/vp8/decoder/decodframe.c
+++ b/vp8/decoder/decodframe.c
@@@ -1085,28 -1036,11 +1132,31 @@@ int vp8_decode_frame(VP8D_COMP *pbi
                              *p = (vp8_prob)vp8_read_literal(bc, 8);
  
                          }
+                         if (k > 0 && *p != pc->fc.coef_probs[i][j][k-1][l])
+                             pbi->independent_partitions = 0;
+ 
                      }
      }
 +#if CONFIG_T8X8
 +    {
 +        // read coef probability tree
 +
 +        for (i = 0; i < BLOCK_TYPES; i++)
 +            for (j = 0; j < COEF_BANDS; j++)
 +                for (k = 0; k < PREV_COEF_CONTEXTS; k++)
 +                    for (l = 0; l < MAX_ENTROPY_TOKENS - 1; l++)
 +                    {
 +
 +                        vp8_prob *const p = pc->fc.coef_probs_8x8 [i][j][k] + l;
 +
 +                        if (vp8_read(bc, vp8_coef_update_probs_8x8 [i][j][k][l]))
 +                        {
 +                            *p = (vp8_prob)vp8_read_literal(bc, 8);
 +
 +                        }
 +                    }
 +    }
 +#endif
  
      vpx_memcpy(&xd->pre, &pc->yv12_fb[pc->lst_fb_idx], sizeof(YV12_BUFFER_CONFIG));
      vpx_memcpy(&xd->dst, &pc->yv12_fb[pc->new_fb_idx], sizeof(YV12_BUFFER_CONFIG));