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
8d69a6e8
Commit
8d69a6e8
authored
Jan 06, 2016
by
Debargha Mukherjee
Browse files
Some fixes on tx size/type selection
For ext_tx experiment. Change-Id: Ie37b9b456b09bde8b606fb978fee4cca8d0326b7
parent
b1d49f24
Changes
1
Hide whitespace changes
Inline
Side-by-side
vp10/encoder/rdopt.c
View file @
8d69a6e8
...
...
@@ -820,8 +820,7 @@ static void choose_largest_tx_size(VP10_COMP *cpi, MACROBLOCK *x,
#if CONFIG_EXT_TX
ext_tx_set
=
get_ext_tx_set
(
mbmi
->
tx_size
,
bs
,
is_inter
);
if
(
is_inter
&&
get_ext_tx_types
(
mbmi
->
tx_size
,
bs
,
is_inter
)
>
1
&&
if
(
get_ext_tx_types
(
mbmi
->
tx_size
,
bs
,
is_inter
)
>
1
&&
!
xd
->
lossless
[
mbmi
->
segment_id
])
{
for
(
tx_type
=
0
;
tx_type
<
TX_TYPES
;
++
tx_type
)
{
if
(
is_inter
)
{
...
...
@@ -931,12 +930,12 @@ static void choose_largest_tx_size(VP10_COMP *cpi, MACROBLOCK *x,
if
(
is_inter
)
{
if
(
ext_tx_set
>
0
)
*
rate
+=
cpi
->
inter_tx_type_costs
[
ext_tx_set
][
mbmi
->
tx_size
]
[
mbmi
->
tx_type
];
[
mbmi
->
tx_type
];
}
else
{
if
(
ext_tx_set
>
0
&&
ALLOW_INTRA_EXT_TX
)
*
rate
+=
cpi
->
intra_tx_type_costs
[
ext_tx_set
][
mbmi
->
tx_size
]
[
mbmi
->
mode
][
mbmi
->
tx_type
];
[
mbmi
->
mode
][
mbmi
->
tx_type
];
}
}
#else
...
...
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