Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Xiph.Org
aom-rav1e
Commits
3dca8ca7
Commit
3dca8ca7
authored
Mar 12, 2014
by
Dmitry Kovalev
Committed by
Gerrit Code Review
Mar 12, 2014
Browse files
Merge "Renaming mode2txfm_map to intra_mode_to_tx_type_lookup."
parents
16c4d961
95aed4a3
Changes
3
Hide whitespace changes
Inline
Side-by-side
vp9/common/vp9_blockd.h
View file @
3dca8ca7
...
...
@@ -254,7 +254,7 @@ static INLINE BLOCK_SIZE get_subsize(BLOCK_SIZE bsize,
return
subsize
;
}
extern
const
TX_TYPE
mode2txfm_ma
p
[
INTRA_MODES
];
extern
const
TX_TYPE
intra_mode_to_tx_type_looku
p
[
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_ma
p
[
mbmi
->
mode
];
return
intra_mode_to_tx_type_looku
p
[
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_ma
p
[
get_y_mode
(
mi
,
ib
)];
return
intra_mode_to_tx_type_looku
p
[
get_y_mode
(
mi
,
ib
)];
}
void
vp9_setup_block_planes
(
MACROBLOCKD
*
xd
,
int
ss_x
,
int
ss_y
);
...
...
vp9/common/vp9_entropy.h
View file @
3dca8ca7
...
...
@@ -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_ma
p
[
mode
]];
return
&
vp9_scan_orders
[
tx_size
][
intra_mode_to_tx_type_looku
p
[
mode
]];
}
}
...
...
vp9/common/vp9_reconintra.c
View file @
3dca8ca7
...
...
@@ -18,7 +18,7 @@
#include
"vp9/common/vp9_reconintra.h"
#include
"vp9/common/vp9_onyxc_int.h"
const
TX_TYPE
mode2txfm_ma
p
[
INTRA_MODES
]
=
{
const
TX_TYPE
intra_mode_to_tx_type_looku
p
[
INTRA_MODES
]
=
{
DCT_DCT
,
// DC
ADST_DCT
,
// V
DCT_ADST
,
// H
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment