Remove variable `skip_mv_refinement_for_diffwtd` The variable 'skip_mv_refinement_for_diffwtd' was named incorrectly in av1_compound_type_rd(). This patch removes the variable and instead uses the speed feature 'enable_fast_compound_mode_search' to skip MV refinement for COMPOUND_DIFFWTD. Change-Id: Ic6e93b09f5b41d29f7cfb13c0a72bf3a98783229
diff --git a/av1/encoder/compound_type.c b/av1/encoder/compound_type.c index d5dcf74..778c3f1 100644 --- a/av1/encoder/compound_type.c +++ b/av1/encoder/compound_type.c
@@ -1307,8 +1307,6 @@ const bool skip_mv_refinement_for_avg_distwtd = enable_fast_compound_mode_search == 3 || (enable_fast_compound_mode_search == 2 && (this_mode != NEW_NEWMV)); - const bool skip_mv_refinement_for_diffwtd = - (!enable_fast_compound_mode_search && cur_type == COMPOUND_DIFFWTD); // Case COMPOUND_AVERAGE and COMPOUND_DISTWTD if (cur_type < COMPOUND_WEDGE) { @@ -1524,7 +1522,8 @@ mbmi->mv[1] = tmp_mv[1]; tmp_rate_mv = best_rate_mv; rs2 = best_rs2; - } else if (skip_mv_refinement_for_diffwtd) { + } else if (!enable_fast_compound_mode_search && + cur_type == COMPOUND_DIFFWTD) { int_mv tmp_mv[2]; int best_mask_index = 0; rs2 += get_interinter_compound_mask_rate(&x->mode_costs, mbmi);