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
703585b2
Commit
703585b2
authored
Jun 14, 2016
by
Hui Su
Committed by
Gerrit Code Review
Jun 14, 2016
Browse files
Merge "Handle intra modes when tx type speed feature is enabled" into nextgenv2
parents
48f51257
8c3b3d36
Changes
1
Hide whitespace changes
Inline
Side-by-side
vp10/encoder/rdopt.c
View file @
703585b2
...
...
@@ -9505,9 +9505,11 @@ void vp10_rd_pick_inter_mode_sb(VP10_COMP *cpi,
break;
}
if (sf->tx_type_search.fast_inter_tx_type_search == 1 &&
xd->lossless[mbmi->segment_id] == 0 &&
best_mode_index >= 0) {
if (xd->lossless[mbmi->segment_id] == 0 && best_mode_index >= 0 &&
((sf->tx_type_search.fast_inter_tx_type_search == 1 &&
is_inter_mode(best_mbmode.mode)) ||
(sf->tx_type_search.fast_intra_tx_type_search == 1 &&
!is_inter_mode(best_mbmode.mode)))) {
int rate_y = 0, rate_uv = 0;
int64_t dist_y = 0, dist_uv = 0;
int skip_y = 0, skip_uv = 0, skip_blk = 0;
...
...
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