From 2fc927c66a6e716bedba35db8a74cbb3b6f3d223 Mon Sep 17 00:00:00 2001 From: Dmitry Kovalev Date: Fri, 19 Jul 2013 15:18:43 -0700 Subject: [PATCH] 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: cc662dd Adding struct tx_probs and struct tx_counts to cleanup the code. Change-Id: I36dd4b3678e902e10aba8dd49b0012eb558c209d --- vp9/common/vp9_entropymode.c | 2 +- vp9/common/vp9_entropymode.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vp9/common/vp9_entropymode.c b/vp9/common/vp9_entropymode.c index f66f2f317..b625caaf0 100644 --- 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], diff --git a/vp9/common/vp9_entropymode.h b/vp9/common/vp9_entropymode.h index fa6722c8d..35ec9c412 100644 --- 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 { -- 2.40.0