diff options
-rw-r--r-- | vp9/common/vp9_blockd.h | 6 | ||||
-rw-r--r-- | vp9/common/vp9_entropy.h | 2 | ||||
-rw-r--r-- | vp9/common/vp9_reconintra.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/vp9/common/vp9_blockd.h b/vp9/common/vp9_blockd.h index b7fadcd3b..b9e30fe9a 100644 --- a/vp9/common/vp9_blockd.h +++ b/vp9/common/vp9_blockd.h @@ -254,7 +254,7 @@ static INLINE BLOCK_SIZE get_subsize(BLOCK_SIZE bsize, return subsize; } -extern const TX_TYPE mode2txfm_map[INTRA_MODES]; +extern const TX_TYPE intra_mode_to_tx_type_lookup[INTRA_MODES]; static INLINE TX_TYPE get_tx_type(PLANE_TYPE plane_type, const MACROBLOCKD *xd) { @@ -262,7 +262,7 @@ static INLINE TX_TYPE get_tx_type(PLANE_TYPE plane_type, if (plane_type != PLANE_TYPE_Y || is_inter_block(mbmi)) return DCT_DCT; - return mode2txfm_map[mbmi->mode]; + return intra_mode_to_tx_type_lookup[mbmi->mode]; } static INLINE TX_TYPE get_tx_type_4x4(PLANE_TYPE plane_type, @@ -272,7 +272,7 @@ static INLINE TX_TYPE get_tx_type_4x4(PLANE_TYPE plane_type, if (plane_type != PLANE_TYPE_Y || xd->lossless || is_inter_block(&mi->mbmi)) return DCT_DCT; - return mode2txfm_map[get_y_mode(mi, ib)]; + return intra_mode_to_tx_type_lookup[get_y_mode(mi, ib)]; } void vp9_setup_block_planes(MACROBLOCKD *xd, int ss_x, int ss_y); diff --git a/vp9/common/vp9_entropy.h b/vp9/common/vp9_entropy.h index f0097775b..15bf8ebb3 100644 --- a/vp9/common/vp9_entropy.h +++ b/vp9/common/vp9_entropy.h @@ -181,7 +181,7 @@ static const INLINE scan_order *get_scan(const MACROBLOCKD *xd, TX_SIZE tx_size, return &vp9_default_scan_orders[tx_size]; } else { const MB_PREDICTION_MODE mode = get_y_mode(mi, block_idx); - return &vp9_scan_orders[tx_size][mode2txfm_map[mode]]; + return &vp9_scan_orders[tx_size][intra_mode_to_tx_type_lookup[mode]]; } } diff --git a/vp9/common/vp9_reconintra.c b/vp9/common/vp9_reconintra.c index 86f4f3578..1b341dd7a 100644 --- a/vp9/common/vp9_reconintra.c +++ b/vp9/common/vp9_reconintra.c @@ -18,7 +18,7 @@ #include "vp9/common/vp9_reconintra.h" #include "vp9/common/vp9_onyxc_int.h" -const TX_TYPE mode2txfm_map[INTRA_MODES] = { +const TX_TYPE intra_mode_to_tx_type_lookup[INTRA_MODES] = { DCT_DCT, // DC ADST_DCT, // V DCT_ADST, // H |