Merge "Fixing problem introduced in one of my previous commits."

f00a237a · Dmitry Kovalev · Gerrit Code Review · c3a56ee5 · 2fc927c6 · f00a237a
Commit f00a237a authored 11 years ago by Dmitry Kovalev Committed by Gerrit Code Review 11 years ago
--- a/vp9/common/vp9_entropymode.c
+++ b/vp9/common/vp9_entropymode.c
@@ -536,7 +536,7 @@ void vp9_adapt_mode_probs(VP9_COMMON *cm) {
      tx_counts_to_branch_counts_16x16(fc->tx_counts.p16x16[i],
                                       branch_ct_16x16p);
      for (j = 0; j < TX_SIZE_MAX_SB - 2; ++j)
-        fc->tx_probs.p16x16[i][j] = update_tx_ct(fc->tx_probs.p16x16[i][j],
+        fc->tx_probs.p16x16[i][j] = update_tx_ct(fc->pre_tx_probs.p16x16[i][j],
                                                 branch_ct_16x16p[j]);

      tx_counts_to_branch_counts_32x32(fc->tx_counts.p32x32[i],

--- a/vp9/common/vp9_entropymode.h
+++ b/vp9/common/vp9_entropymode.h
@@ -26,7 +26,7 @@ struct VP9Common;
 struct tx_probs {
  vp9_prob p32x32[TX_SIZE_CONTEXTS][TX_SIZE_MAX_SB - 1];
  vp9_prob p16x16[TX_SIZE_CONTEXTS][TX_SIZE_MAX_SB - 2];
-  vp9_prob p8x8[TX_SIZE_CONTEXTS][TX_SIZE_MAX_SB - 2];
+  vp9_prob p8x8[TX_SIZE_CONTEXTS][TX_SIZE_MAX_SB - 3];
 };

 struct tx_counts {