hashirama/uvg266
1
0
Fork 0
mirror of https://github.com/ultravideo/uvg266.git synced 2024-11-24 10:34:05 +00:00
Code Issues Actions Projects Releases Wiki Activity

Enable merge analysis for smp and amp

Browse source
This commit is contained in:
Ari Lemmetti 2019-09-02 17:31:51 +03:00
parent 557bcbc6aa
commit 3bc510712f
1 changed files with 68 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/search_inter.c
View file

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