summaryrefslogtreecommitdiff
path: root/vp9/common/vp9_entropymode.c
diff options
context:
space:
mode:
authorDmitry Kovalev <dkovalev@google.com>2013-07-26 17:15:37 -0700
committerDmitry Kovalev <dkovalev@google.com>2013-07-29 12:25:34 -0700
commit23391ea8353f9535ef12d0b797f994f1e181ca2d (patch)
tree6d649108b18043567336bff3e0377e6519e1ae86 /vp9/common/vp9_entropymode.c
parentdecb1b94deb4420ab540b0963f1ca91ed20137c6 (diff)
downloadlibvpx-23391ea8353f9535ef12d0b797f994f1e181ca2d.tar
libvpx-23391ea8353f9535ef12d0b797f994f1e181ca2d.tar.gz
libvpx-23391ea8353f9535ef12d0b797f994f1e181ca2d.tar.bz2
libvpx-23391ea8353f9535ef12d0b797f994f1e181ca2d.zip
Renaming TX_SIZE_MAX_SB to TX_SIZES.
Change-Id: I6aa4191935aa93461a07c41b59fdae1eb5f5f107
Diffstat (limited to 'vp9/common/vp9_entropymode.c')
-rw-r--r--vp9/common/vp9_entropymode.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/vp9/common/vp9_entropymode.c b/vp9/common/vp9_entropymode.c
index faaa1c2fa..9ec3f4f6c 100644
--- a/vp9/common/vp9_entropymode.c
+++ b/vp9/common/vp9_entropymode.c
@@ -455,25 +455,25 @@ void vp9_adapt_mode_probs(VP9_COMMON *cm) {
if (cm->tx_mode == TX_MODE_SELECT) {
int j;
- unsigned int branch_ct_8x8p[TX_SIZE_MAX_SB - 3][2];
- unsigned int branch_ct_16x16p[TX_SIZE_MAX_SB - 2][2];
- unsigned int branch_ct_32x32p[TX_SIZE_MAX_SB - 1][2];
+ unsigned int branch_ct_8x8p[TX_SIZES - 3][2];
+ unsigned int branch_ct_16x16p[TX_SIZES - 2][2];
+ unsigned int branch_ct_32x32p[TX_SIZES - 1][2];
for (i = 0; i < TX_SIZE_CONTEXTS; ++i) {
tx_counts_to_branch_counts_8x8(counts->tx.p8x8[i], branch_ct_8x8p);
- for (j = 0; j < TX_SIZE_MAX_SB - 3; ++j)
+ for (j = 0; j < TX_SIZES - 3; ++j)
fc->tx_probs.p8x8[i][j] = update_ct2(pre_fc->tx_probs.p8x8[i][j],
branch_ct_8x8p[j]);
tx_counts_to_branch_counts_16x16(counts->tx.p16x16[i],
branch_ct_16x16p);
- for (j = 0; j < TX_SIZE_MAX_SB - 2; ++j)
+ for (j = 0; j < TX_SIZES - 2; ++j)
fc->tx_probs.p16x16[i][j] = update_ct2(pre_fc->tx_probs.p16x16[i][j],
branch_ct_16x16p[j]);
tx_counts_to_branch_counts_32x32(counts->tx.p32x32[i],
branch_ct_32x32p);
- for (j = 0; j < TX_SIZE_MAX_SB - 1; ++j)
+ for (j = 0; j < TX_SIZES - 1; ++j)
fc->tx_probs.p32x32[i][j] = update_ct2(pre_fc->tx_probs.p32x32[i][j],
branch_ct_32x32p[j]);
}