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
856d1798
Commit
856d1798
authored
Oct 26, 2017
by
Nathan E. Egge
Committed by
Nathan Egge
Oct 27, 2017
Browse files
Fix bug when enabling 32-point DST in daala_tx.
Change-Id: I567420e45f54cfe991065614d0a8c0c4d637e116
parent
10a0380a
Changes
1
Hide whitespace changes
Inline
Side-by-side
av1/common/blockd.h
View file @
856d1798
...
...
@@ -1240,8 +1240,12 @@ static INLINE TX_TYPE av1_get_tx_type(PLANE_TYPE plane_type,
return
DCT_DCT
;
}
#endif // CONFIG_MRC_TX
#if CONFIG_DAALA_TX32
if
(
xd
->
lossless
[
mbmi
->
segment_id
]
||
txsize_sqr_map
[
tx_size
]
>
TX_32X32
)
#else
if
(
xd
->
lossless
[
mbmi
->
segment_id
]
||
txsize_sqr_map
[
tx_size
]
>
TX_32X32
||
(
txsize_sqr_map
[
tx_size
]
>=
TX_32X32
&&
!
is_inter_block
(
mbmi
)))
#endif
return
DCT_DCT
;
if
(
plane_type
==
PLANE_TYPE_Y
)
{
#if !ALLOW_INTRA_EXT_TX
...
...
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