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

Fix non-determinism with tiles

Browse source 
Earlier fix that fixed the supply side of the cu_array to take tile
coordinates into account should have been accompanied with this one
that does the same thing to demand side.
This commit is contained in:
Ari Koivula 2016-03-03 17:39:20 +02:00
parent ad1c42905d
commit 86219aa0fc
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/search_inter.c
View file

@ -1091,9 +1091,17 @@ static void search_pu_inter_ref(const encoder_state_t * const state,
// When temporal motion vector candidates are added, there is probably // When temporal motion vector candidates are added, there is probably
// no point to this anymore, but for now it helps. // no point to this anymore, but for now it helps.
// TODO: Update this to work with SMP/AMP blocks. // TODO: Update this to work with SMP/AMP blocks.
int mid_x_cu = (x + (width >> 1)) / 8; const vector2d_t frame_px = {
int mid_y_cu = (y + (height >> 1)) / 8; (state->tile->lcu_offset_x << LOG2_LCU_WIDTH) + x,
cu_info_t *ref_cu = &state->global->ref->cu_arrays[ref_idx]->data[mid_x_cu + mid_y_cu * (frame->width_in_lcu << MAX_DEPTH)]; (state->tile->lcu_offset_y << LOG2_LCU_WIDTH) + y
};
const vector2d_t frame_cu = {
(frame_px.x + (width >> 1)) >> MIN_SIZE,
(frame_px.y + (width >> 1)) >> MIN_SIZE
};
const cu_info_t *ref_cu_array = state->global->ref->cu_arrays[ref_idx]->data;
const int width_in_scu = frame->width_in_lcu << MAX_DEPTH;
const cu_info_t *ref_cu = &ref_cu_array[frame_cu.x + frame_cu.y * width_in_scu];
if (ref_cu->type == CU_INTER) { if (ref_cu->type == CU_INTER) {
if (ref_cu->inter.mv_dir & 1) { if (ref_cu->inter.mv_dir & 1) {
mv.x = ref_cu->inter.mv[0][0]; mv.x = ref_cu->inter.mv[0][0];