diff options
Diffstat (limited to 'vp9/common/vp9_blockd.h')
| -rw-r--r-- | vp9/common/vp9_blockd.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/vp9/common/vp9_blockd.h b/vp9/common/vp9_blockd.h index 52b736b84..238060168 100644 --- a/vp9/common/vp9_blockd.h +++ b/vp9/common/vp9_blockd.h @@ -124,12 +124,10 @@ typedef enum { #define TX_SIZE_PROBS 6 // (TX_SIZE_MAX_SB * (TX_SIZE_MAX_SB - 1) / 2) -#if TX_SIZE_PROBS == 6 -#define get_tx_probs_offset(b) ((b) < BLOCK_SIZE_MB16X16 ? 0 : \ - (b) < BLOCK_SIZE_SB32X32 ? 1 : 3) -#else -#define get_tx_probs_offset(b) 0 -#endif +#define get_tx_probs(c, b) ((b) < BLOCK_SIZE_MB16X16 ? \ + (c)->fc.tx_probs_8x8p : \ + (b) < BLOCK_SIZE_SB32X32 ? \ + (c)->fc.tx_probs_16x16p : (c)->fc.tx_probs_32x32p) /* For keyframes, intra block modes are predicted by the (already decoded) modes for the Y blocks to the left and above us; for interframes, there |