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
e4dc5f8d
Commit
e4dc5f8d
authored
Oct 07, 2016
by
Debargha Mukherjee
Committed by
Gerrit Code Review
Oct 07, 2016
Browse files
Merge "A bug fix for var-tx" into nextgenv2
parents
24aa59cc
28d924b7
Changes
2
Hide whitespace changes
Inline
Side-by-side
av1/encoder/encodeframe.c
View file @
e4dc5f8d
...
...
@@ -1304,10 +1304,13 @@ static void update_state_supertx(AV1_COMP *cpi, ThreadData *td,
#if CONFIG_VAR_TX
{
const
TX_SIZE
mtx
=
mbmi
->
tx_size
;
const
int
num_4x4_blocks_wide
=
num_4x4_blocks_wide_txsize_lookup
[
mtx
]
>>
1
;
const
int
num_4x4_blocks_high
=
num_4x4_blocks_high_txsize_lookup
[
mtx
]
>>
1
;
int
idy
,
idx
;
for
(
idy
=
0
;
idy
<
(
1
<<
mtx
)
/
2
;
++
idy
)
for
(
idx
=
0
;
idx
<
(
1
<<
mtx
)
/
2
;
++
idx
)
mbmi
->
inter_tx_size
[
idy
][
idx
]
=
mbmi
->
tx_size
;
mbmi
->
inter_tx_size
[
0
][
0
]
=
mtx
;
for
(
idy
=
0
;
idy
<
num_4x4_blocks_high
;
++
idy
)
for
(
idx
=
0
;
idx
<
num_4x4_blocks_wide
;
++
idx
)
mbmi
->
inter_tx_size
[
idy
][
idx
]
=
mtx
;
}
#endif // CONFIG_VAR_TX
// Turn motion variation off for supertx
...
...
av1/encoder/rdopt.c
View file @
e4dc5f8d
...
...
@@ -3321,7 +3321,7 @@ static void select_tx_type_yrd(const AV1_COMP *cpi, MACROBLOCK *x, int *rate,
TX_TYPE tx_type, best_tx_type = DCT_DCT;
const int is_inter = is_inter_block(mbmi);
TX_SIZE best_tx_size[MAX_MIB_SIZE][MAX_MIB_SIZE];
TX_SIZE best_tx =
TX_SIZES
;
TX_SIZE best_tx =
max_txsize_lookup[bsize]
;
uint8_t best_blk_skip[MAX_MIB_SIZE * MAX_MIB_SIZE * 4];
const int n4 = 1 << (num_pels_log2_lookup[bsize] - 4);
int idx, idy;
...
...
@@ -7707,6 +7707,7 @@ static int64_t handle_inter_mode(
} else {
x->skip = 1;
*disable_skip = 1;
mbmi->tx_size = tx_size_from_tx_mode(bsize, cm->tx_mode, 1);
// The cost of skip bit needs to be added.
#if CONFIG_OBMC || CONFIG_WARPED_MOTION
...
...
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