diff options
Diffstat (limited to 'vp9/common')
| -rw-r--r-- | vp9/common/vp9_entropymode.c | 2 | ||||
| -rw-r--r-- | vp9/common/vp9_entropymode.h | 2 | ||||
| -rw-r--r-- | vp9/common/vp9_onyx.h | 28 |
3 files changed, 2 insertions, 30 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 { diff --git a/vp9/common/vp9_onyx.h b/vp9/common/vp9_onyx.h index d266c1567..fe8122b46 100644 --- a/vp9/common/vp9_onyx.h +++ b/vp9/common/vp9_onyx.h @@ -64,34 +64,6 @@ extern "C" FRAMEFLAGS_ALTREF = 4, } FRAMETYPE_FLAGS; - -#include <assert.h> - static INLINE void Scale2Ratio(int mode, int *hr, int *hs) { - switch (mode) { - case NORMAL: - *hr = 1; - *hs = 1; - break; - case FOURFIVE: - *hr = 4; - *hs = 5; - break; - case THREEFIVE: - *hr = 3; - *hs = 5; - break; - case ONETWO: - *hr = 1; - *hs = 2; - break; - default: - *hr = 1; - *hs = 1; - assert(0); - break; - } - } - typedef struct { int version; // 4 versions of bitstream defined: // 0 - best quality/slowest decode, |