Commit 2fc927c6 authored by Dmitry Kovalev's avatar Dmitry Kovalev
Browse files

Fixing problem introduced in one of my previous commits.

Changing fc->tx_probs back to fc->pre_tx_probs. This change actually
affects the bitstream but current test vectors work. Chrome branch is not
affected at all. Broken since:

cc662dd7 Adding struct tx_probs and struct tx_counts to cleanup the code.

Change-Id: I36dd4b3678e902e10aba8dd49b0012eb558c209d
parent 0d204f48
...@@ -536,7 +536,7 @@ void vp9_adapt_mode_probs(VP9_COMMON *cm) { ...@@ -536,7 +536,7 @@ void vp9_adapt_mode_probs(VP9_COMMON *cm) {
tx_counts_to_branch_counts_16x16(fc->tx_counts.p16x16[i], tx_counts_to_branch_counts_16x16(fc->tx_counts.p16x16[i],
branch_ct_16x16p); branch_ct_16x16p);
for (j = 0; j < TX_SIZE_MAX_SB - 2; ++j) 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]); branch_ct_16x16p[j]);
tx_counts_to_branch_counts_32x32(fc->tx_counts.p32x32[i], tx_counts_to_branch_counts_32x32(fc->tx_counts.p32x32[i],
......
...@@ -26,7 +26,7 @@ struct VP9Common; ...@@ -26,7 +26,7 @@ struct VP9Common;
struct tx_probs { struct tx_probs {
vp9_prob p32x32[TX_SIZE_CONTEXTS][TX_SIZE_MAX_SB - 1]; vp9_prob p32x32[TX_SIZE_CONTEXTS][TX_SIZE_MAX_SB - 1];
vp9_prob p16x16[TX_SIZE_CONTEXTS][TX_SIZE_MAX_SB - 2]; 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 { struct tx_counts {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment