Commit 95aed4a3 authored by Dmitry Kovalev's avatar Dmitry Kovalev
Browse files

Renaming mode2txfm_map to intra_mode_to_tx_type_lookup.

Change-Id: I9a19eb96907f674e3ce1e573f5dd49f0fbf2ae4f
parent 6207a38b
...@@ -254,7 +254,7 @@ static INLINE BLOCK_SIZE get_subsize(BLOCK_SIZE bsize, ...@@ -254,7 +254,7 @@ static INLINE BLOCK_SIZE get_subsize(BLOCK_SIZE bsize,
return subsize; 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, static INLINE TX_TYPE get_tx_type(PLANE_TYPE plane_type,
const MACROBLOCKD *xd) { const MACROBLOCKD *xd) {
...@@ -262,7 +262,7 @@ static INLINE TX_TYPE get_tx_type(PLANE_TYPE plane_type, ...@@ -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)) if (plane_type != PLANE_TYPE_Y || is_inter_block(mbmi))
return DCT_DCT; 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, 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, ...@@ -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)) if (plane_type != PLANE_TYPE_Y || xd->lossless || is_inter_block(&mi->mbmi))
return DCT_DCT; 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); void vp9_setup_block_planes(MACROBLOCKD *xd, int ss_x, int ss_y);
......
...@@ -181,7 +181,7 @@ static const INLINE scan_order *get_scan(const MACROBLOCKD *xd, TX_SIZE tx_size, ...@@ -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]; return &vp9_default_scan_orders[tx_size];
} else { } else {
const MB_PREDICTION_MODE mode = get_y_mode(mi, block_idx); 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]];
} }
} }
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#include "vp9/common/vp9_reconintra.h" #include "vp9/common/vp9_reconintra.h"
#include "vp9/common/vp9_onyxc_int.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 DCT_DCT, // DC
ADST_DCT, // V ADST_DCT, // V
DCT_ADST, // H DCT_ADST, // H
......
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