Skip to content
GitLab
Menu
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
c2ebfbfc
Commit
c2ebfbfc
authored
Apr 15, 2017
by
Angie Chiang
Browse files
Turn on tx_type search when sb_type < BLOCK_8X8
Change-Id: I8d9686c36ebf7057c4432bb5a29ade78dc21d0a7
parent
3ca0e672
Changes
1
Hide whitespace changes
Inline
Side-by-side
av1/common/blockd.h
View file @
c2ebfbfc
...
...
@@ -902,9 +902,8 @@ static INLINE TX_TYPE get_tx_type(PLANE_TYPE plane_type, const MACROBLOCKD *xd,
int
block
,
TX_SIZE
tx_size
)
{
const
MODE_INFO
*
const
mi
=
xd
->
mi
[
0
];
const
MB_MODE_INFO
*
const
mbmi
=
&
mi
->
mbmi
;
const
int
block_raster_idx
=
av1_block_index_to_raster_order
(
tx_size
,
block
);
#if !CONFIG_LV_MAP
const
int
block_raster_idx
=
av1_block_index_to_raster_order
(
tx_size
,
block
);
if
(
FIXED_TX_TYPE
)
return
get_default_tx_type
(
plane_type
,
xd
,
block_raster_idx
,
tx_size
);
...
...
@@ -958,14 +957,6 @@ static INLINE TX_TYPE get_tx_type(PLANE_TYPE plane_type, const MACROBLOCKD *xd,
if
(
plane_type
!=
PLANE_TYPE_Y
||
xd
->
lossless
[
mbmi
->
segment_id
]
||
mbmi
->
tx_size
>=
TX_32X32
)
{
tx_type
=
DCT_DCT
;
}
else
if
(
mbmi
->
sb_type
<
BLOCK_8X8
)
{
if
(
is_inter_block
(
mbmi
))
// Sub8x8-Inter
tx_type
=
DCT_DCT
;
else
// Sub8x8 Intra OR UV-Intra
tx_type
=
intra_mode_to_tx_type_context
[
plane_type
==
PLANE_TYPE_Y
?
get_y_mode
(
mi
,
block_raster_idx
)
:
mbmi
->
uv_mode
];
}
else
{
tx_type
=
mbmi
->
txk_type
[
block
];
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a 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