Enable merge analysis for smp and amp
@@ -1551,8 +1551,6 @@ static void search_pu_inter(encoder_state_t * const state,
mrg_costs[i] = MAX_DOUBLE;
}
- if (cur_cu->part_size == SIZE_2Nx2N) {
-
int num_rdo_cands = 0;
// Check motion vector constraints and perform rough search
@@ -1599,7 +1597,7 @@ static void search_pu_inter(encoder_state_t * const state,
// Early Skip Mode Decision
bool has_chroma = state->encoder_control->chroma_format != KVZ_CSP_400;
- if (cfg->early_skip) {
+ if (cfg->early_skip && cur_cu->part_size == SIZE_2Nx2N) {
for (int merge_rdo_idx = 0; merge_rdo_idx < num_rdo_cands; ++merge_rdo_idx) {
// Reconstruct blocks with merge candidate.
@@ -1635,7 +1633,6 @@ static void search_pu_inter(encoder_state_t * const state,
}
}
}
- }
// AMVP search starts here
for (int ref_idx = 0; ref_idx < state->frame->ref->used_size; ref_idx++) {
