Commit 703585b2 authored by Hui Su's avatar Hui Su Committed by Gerrit Code Review
Browse files

Merge "Handle intra modes when tx type speed feature is enabled" into nextgenv2

parents 48f51257 8c3b3d36
...@@ -9505,9 +9505,11 @@ void vp10_rd_pick_inter_mode_sb(VP10_COMP *cpi, ...@@ -9505,9 +9505,11 @@ void vp10_rd_pick_inter_mode_sb(VP10_COMP *cpi,
break; break;
} }
if (sf->tx_type_search.fast_inter_tx_type_search == 1 && if (xd->lossless[mbmi->segment_id] == 0 && best_mode_index >= 0 &&
xd->lossless[mbmi->segment_id] == 0 && ((sf->tx_type_search.fast_inter_tx_type_search == 1 &&
best_mode_index >= 0) { 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; int rate_y = 0, rate_uv = 0;
int64_t dist_y = 0, dist_uv = 0; int64_t dist_y = 0, dist_uv = 0;
int skip_y = 0, skip_uv = 0, skip_blk = 0; int skip_y = 0, skip_uv = 0, skip_blk = 0;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment