Commit 7c7e555c authored by Angie Chiang's avatar Angie Chiang Committed by Gerrit Code Review

Merge changes I6faedb29,Ic6586114 into nextgenv2

* changes:
  Remove speed feature of ext_interp experiment
  Refactor: handle_inter()
parents 99e7a8d8 d0aa90ed
......@@ -7017,14 +7017,11 @@ static int64_t handle_inter_mode(
int64_t tmp_dist_sum = 0;
#if CONFIG_DUAL_FILTER
#if CONFIG_EXT_INTERP
for (i = 0; i < 25; ++i) {
#else
for (i = 0; i < 9; ++i) {
#endif
for (i = 0; i < SWITCHABLE_FILTERS * SWITCHABLE_FILTERS; ++i)
#else
for (i = 0; i < SWITCHABLE_FILTERS; ++i) {
for (i = 0; i < SWITCHABLE_FILTERS; ++i)
#endif
{
int j;
int64_t rs_rd;
int tmp_skip_sb = 0;
......@@ -7047,14 +7044,6 @@ static int64_t handle_inter_mode(
} else {
int rate_sum = 0;
int64_t dist_sum = 0;
if (i > 0 && cpi->sf.adaptive_interp_filter_search &&
(cpi->sf.interp_filter_search_mask & (1 << i))) {
rate_sum = INT_MAX;
dist_sum = INT64_MAX;
continue;
}
if ((cm->interp_filter == SWITCHABLE && (!i || best_needs_copy)) ||
#if CONFIG_EXT_INTER
is_comp_interintra_pred ||
......@@ -7086,13 +7075,6 @@ static int64_t handle_inter_mode(
tmp_dist_sum = dist_sum;
}
}
if (i == 0 && cpi->sf.use_rd_breakout && ref_best_rd < INT64_MAX) {
if (rd / 2 > ref_best_rd) {
restore_dst_buf(xd, orig_dst, orig_dst_stride);
return INT64_MAX;
}
}
newbest = i == 0 || rd < best_rd;
if (newbest) {
......@@ -7113,10 +7095,11 @@ static int64_t handle_inter_mode(
if ((cm->interp_filter == SWITCHABLE && newbest) ||
(cm->interp_filter != SWITCHABLE &&
#if CONFIG_DUAL_FILTER
cm->interp_filter == mbmi->interp_filter[0])) {
cm->interp_filter == mbmi->interp_filter[0]
#else
cm->interp_filter == mbmi->interp_filter)) {
cm->interp_filter == mbmi->interp_filter
#endif
)) {
pred_exists = 1;
tmp_rd = best_rd;
......
Markdown is supported
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