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

Fixed reference POC indexing

Browse source
This commit is contained in:
RLamm 2020-03-06 16:20:00 +02:00
parent bf24831780
commit 27fe716654
1 changed files with 24 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/search_inter.c
View file

@ -1135,13 +1135,23 @@ static void search_frac(inter_search_info_t *info)
if (src.malloc_used) free(src.buffer); if (src.malloc_used) free(src.buffer);
} }
/**
* \brief Calculate the scaled MV
*/
static INLINE int16_t get_scaled_mv(int16_t mv, int scale) static INLINE int16_t get_scaled_mv(int16_t mv, int scale)
{ {
int32_t scaled = scale * mv; int32_t scaled = scale * mv;
return CLIP(-32768, 32767, (scaled + 127 + (scaled < 0)) >> 8); return CLIP(-32768, 32767, (scaled + 127 + (scaled < 0)) >> 8);
} }
/**
* \brief Scale the MV according to the POC difference
*
* \param current_poc POC of current frame
* \param current_ref_poc POC of reference frame
* \param neighbor_poc POC of neighbor frame
* \param neighbor_ref_poc POC of neighbors reference frame
* \param mv_cand MV candidates to scale
*/
static void apply_mv_scaling(int32_t current_poc, static void apply_mv_scaling(int32_t current_poc,
int32_t current_ref_poc, int32_t current_ref_poc,
int32_t neighbor_poc, int32_t neighbor_poc,
@ -1242,7 +1252,14 @@ static void search_pu_inter_ref(inter_search_info_t *info,
mv.x = ref_cu->inter.mv[1][0]; mv.x = ref_cu->inter.mv[1][0];
mv.y = ref_cu->inter.mv[1][1]; mv.y = ref_cu->inter.mv[1][1];
} }
// Apply mv scaling if neighbor poc is available
if (info->state->frame->ref_LX_size[ref_list] > 0) { if (info->state->frame->ref_LX_size[ref_list] > 0) {
// When there are reference pictures from the future (POC > current POC)
// in L0 or L1, the primary list for the colocated PU is the inverse of
// collocated_from_l0_flag. Otherwise it is equal to reflist.
//
// Kvazaar always sets collocated_from_l0_flag so the list is L1 when
// there are future references.
int col_list = ref_list; int col_list = ref_list;
for (int i = 0; i < info->state->frame->ref->used_size; i++) { for (int i = 0; i < info->state->frame->ref->used_size; i++) {
if (info->state->frame->ref->pocs[i] > info->state->frame->poc) { if (info->state->frame->ref->pocs[i] > info->state->frame->poc) {
@ -1250,19 +1267,20 @@ static void search_pu_inter_ref(inter_search_info_t *info,
break; break;
} }
} }
if ((ref_cu->inter.mv_dir & (col_list + 1)) == 0) { if ((ref_cu->inter.mv_dir & (col_list + 1)) == 0) {
// Use the other list if the colocated PU does not have a MV for the // Use the other list if the colocated PU does not have a MV for the
// primary list. // primary list.
col_list = 1 - col_list; col_list = 1 - col_list;
} }
uint8_t neighbor_poc_index = info->state->frame->ref_LX[ref_list][LX_idx];
// Scaling takes current POC, reference POC, neighbor POC and neighbor reference POC as argument
apply_mv_scaling( apply_mv_scaling(
info->state->frame->poc, info->state->frame->poc,
info->state->frame->ref->pocs[temp_ref_idx],
info->state->frame->ref->pocs[info->state->frame->ref_LX[ref_list][LX_idx]], info->state->frame->ref->pocs[info->state->frame->ref_LX[ref_list][LX_idx]],
info->state->frame->ref->images[info->state->frame->ref_LX[ref_list][LX_idx]]->ref_pocs[ info->state->frame->ref->pocs[neighbor_poc_index],
info->state->frame->ref->ref_LXs[info->state->frame->ref_LX[ref_list][LX_idx]] info->state->frame->ref->images[neighbor_poc_index]->ref_pocs[
info->state->frame->ref->ref_LXs[neighbor_poc_index]
[col_list] [col_list]
[ref_cu->inter.mv_ref[col_list]] [ref_cu->inter.mv_ref[col_list]]
], ],