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

Fix inter bipred search

Browse source 
When the number of merge candidates was five, biprediction search would
read past the bounds of the priority list arrays. Fixed to limit the
search to the first four candidates.
This commit is contained in:
Arttu Ylä-Outinen 2017-01-31 18:17:16 +09:00
parent 2c069a3e5f
commit 1e6463c08b
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/search_inter.c
View file

@ -1477,18 +1477,16 @@ static void search_pu_inter(encoder_state_t * const state,
if (can_use_bipred) { if (can_use_bipred) {
lcu_t *templcu = MALLOC(lcu_t, 1); lcu_t *templcu = MALLOC(lcu_t, 1);
unsigned cu_width = LCU_WIDTH >> depth; unsigned cu_width = LCU_WIDTH >> depth;
#define NUM_PRIORITY_LIST 12;
static const uint8_t priorityList0[] = { 0, 1, 0, 2, 1, 2, 0, 3, 1, 3, 2, 3 }; static const uint8_t priorityList0[] = { 0, 1, 0, 2, 1, 2, 0, 3, 1, 3, 2, 3 };
static const uint8_t priorityList1[] = { 1, 0, 2, 0, 2, 1, 3, 0, 3, 1, 3, 2 }; static const uint8_t priorityList1[] = { 1, 0, 2, 0, 2, 1, 3, 0, 3, 1, 3, 2 };
uint8_t cutoff = num_cand; const unsigned num_cand_pairs = MIN(num_cand * (num_cand - 1), 12);
kvz_mvd_cost_func *calc_mvd = calc_mvd_cost; kvz_mvd_cost_func *calc_mvd = calc_mvd_cost;
if (state->encoder_control->cfg->mv_rdo) { if (state->encoder_control->cfg->mv_rdo) {
calc_mvd = kvz_calc_mvd_cost_cabac; calc_mvd = kvz_calc_mvd_cost_cabac;
} }
for (int32_t idx = 0; idx<cutoff*(cutoff - 1); idx++) { for (int32_t idx = 0; idx < num_cand_pairs; idx++) {
uint8_t i = priorityList0[idx]; uint8_t i = priorityList0[idx];
uint8_t j = priorityList1[idx]; uint8_t j = priorityList1[idx];
if (i >= num_cand || j >= num_cand) break; if (i >= num_cand || j >= num_cand) break;