Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Xiph.Org
aom-rav1e
Commits
d610d209
Commit
d610d209
authored
Sep 09, 2016
by
Debargha Mukherjee
Committed by
Gerrit Code Review
Sep 09, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge "Fix some var_tx related rd_costing mismatches" into nextgenv2
parents
e51ee021
c0b4d7ae
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
10 deletions
+8
-10
av1/encoder/rdopt.c
av1/encoder/rdopt.c
+8
-10
No files found.
av1/encoder/rdopt.c
View file @
d610d209
...
...
@@ -3204,11 +3204,7 @@ static int64_t select_tx_size_fix_type(const AV1_COMP *cpi, MACROBLOCK *x,
const AV1_COMMON *const cm = &cpi->common;
MACROBLOCKD *const xd = &x->e_mbd;
MB_MODE_INFO *const mbmi = &xd->mi[0]->mbmi;
const TX_SIZE max_tx_size = max_txsize_lookup[bsize];
const int is_inter = is_inter_block(mbmi);
#if CONFIG_EXT_TX
int ext_tx_set = get_ext_tx_set(max_tx_size, bsize, is_inter);
#endif // CONFIG_EXT_TX
aom_prob skip_prob = av1_get_skip_prob(cm, xd);
int s0 = av1_cost_bit(skip_prob, 0);
int s1 = av1_cost_bit(skip_prob, 1);
...
...
@@ -3275,25 +3271,27 @@ static int64_t select_tx_size_fix_type(const AV1_COMP *cpi, MACROBLOCK *x,
if (*rate == INT_MAX) return INT64_MAX;
#if CONFIG_EXT_TX
if (get_ext_tx_types(m
ax_
tx_size, bsize, is_inter) > 1 &&
if (get_ext_tx_types(m
bmi->
tx_size, bsize, is_inter) > 1 &&
!xd->lossless[xd->mi[0]->mbmi.segment_id]) {
int ext_tx_set = get_ext_tx_set(mbmi->tx_size, bsize, is_inter);
if (is_inter) {
if (ext_tx_set > 0)
*rate +=
cpi->inter_tx_type_costs[ext_tx_set][max_tx_size][mbmi->tx_type];
cpi->inter_tx_type_costs
[ext_tx_set][txsize_sqr_up_map[mbmi->tx_size]][mbmi->tx_type];
} else {
if (ext_tx_set > 0 && ALLOW_INTRA_EXT_TX)
*rate += cpi->intra_tx_type_costs[ext_tx_set][m
ax_
tx_size][mbmi->mode]
*rate += cpi->intra_tx_type_costs[ext_tx_set][m
bmi->
tx_size][mbmi->mode]
[mbmi->tx_type];
}
}
#else // CONFIG_EXT_TX
if (m
ax_
tx_size < TX_32X32 && !xd->lossless[xd->mi[0]->mbmi.segment_id]) {
if (m
bmi->
tx_size < TX_32X32 && !xd->lossless[xd->mi[0]->mbmi.segment_id]) {
if (is_inter)
*rate += cpi->inter_tx_type_costs[m
ax_
tx_size][mbmi->tx_type];
*rate += cpi->inter_tx_type_costs[m
bmi->
tx_size][mbmi->tx_type];
else
*rate += cpi->intra_tx_type_costs
[m
ax_
tx_size][intra_mode_to_tx_type_context[mbmi->mode]]
[m
bmi->
tx_size][intra_mode_to_tx_type_context[mbmi->mode]]
[mbmi->tx_type];
}
#endif // CONFIG_EXT_TX
...
...
Write
Preview
Markdown
is supported
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