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

Deal with impossible mv constraints

Browse source 
If 0,0 vector is illegal, it's possible that no legal movement vector,
is found, in which case a large cost is returned instead. The cost
overflowed and there is all sorts of silliness with converting from
double to int, but I'm not going to fix all of it because when we
remove the doubles it will all get fixed.
This commit is contained in:
Ari Koivula 2016-02-29 19:15:05 +02:00
parent b1adf1576a
commit 3dcc0957f8
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/search.c
View file

@ -524,7 +524,7 @@ static double search_cu(encoder_state_t * const state, int x, int y, int depth,
&& WITHIN(depth, ctrl->pu_depth_inter.min, ctrl->pu_depth_inter.max); && WITHIN(depth, ctrl->pu_depth_inter.min, ctrl->pu_depth_inter.max);
if (can_use_inter) { if (can_use_inter) {
int mode_cost = kvz_search_cu_inter(state, x, y, depth, &work_tree[depth]); double mode_cost = kvz_search_cu_inter(state, x, y, depth, &work_tree[depth]);
if (mode_cost < cost) { if (mode_cost < cost) {
cost = mode_cost; cost = mode_cost;
cur_cu->type = CU_INTER; cur_cu->type = CU_INTER;

28
src/search_inter.c
View file

@ -1149,8 +1149,6 @@ static void search_pu_inter_ref(const encoder_state_t * const state,
break; break;
} }
assert(fracmv_within_tile(state, &orig, mv.x, mv.y, width, -1));
if (state->encoder_control->cfg->fme_level > 0) { if (state->encoder_control->cfg->fme_level > 0) {
temp_cost = search_frac(state, temp_cost = search_frac(state,
width, height, width, height,
@ -1163,7 +1161,6 @@ static void search_pu_inter_ref(const encoder_state_t * const state,
num_cand, num_cand,
ref_idx, ref_idx,
&temp_bitcost); &temp_bitcost);
assert(fracmv_within_tile(state, &orig, mv.x, mv.y, width, -1));
} }
merged = 0; merged = 0;
@ -1290,7 +1287,7 @@ static int search_pu_inter(const encoder_state_t * const state,
cur_cu->inter.mv_cand[0] = 0; cur_cu->inter.mv_cand[0] = 0;
cur_cu->inter.mv_cand[1] = 0; cur_cu->inter.mv_cand[1] = 0;
cur_cu->inter.cost = UINT_MAX; cur_cu->inter.cost = INT_MAX;
uint32_t ref_idx; uint32_t ref_idx;
for (ref_idx = 0; ref_idx < state->global->ref->used_size; ref_idx++) { for (ref_idx = 0; ref_idx < state->global->ref->used_size; ref_idx++) {
@ -1345,16 +1342,12 @@ static int search_pu_inter(const encoder_state_t * const state,
mv[1][0] = merge_cand[j].mv[1][0]; mv[1][0] = merge_cand[j].mv[1][0];
mv[1][1] = merge_cand[j].mv[1][1]; mv[1][1] = merge_cand[j].mv[1][1];
// Check boundaries when using owf to process multiple frames at the same time {
if (max_px_below_lcu >= 0) { // Don't try merge candidates that don't satisfy mv constraints.
// When SAO is off, row is considered reconstructed when the last LCU vector2d_t orig = { x, y };
// is done, although the bottom 2 pixels might still need deblocking. if (fracmv_within_tile(state, &orig, mv[0][0], mv[0][1], width, -1) ||
// To work around this, add 2 luma pixels to the reach of the mv fracmv_within_tile(state, &orig, mv[1][0], mv[1][1], width, -1))
// in order to avoid referencing those possibly non-deblocked pixels. {
int mv_lcu_row_reach_1 = ((y+(mv[0][1]>>2)) + (LCU_WIDTH >> depth) - 1 + 2) / LCU_WIDTH;
int mv_lcu_row_reach_2 = ((y+(mv[1][1]>>2)) + (LCU_WIDTH >> depth) - 1 + 2) / LCU_WIDTH;
int cur_lcu_row = y / LCU_WIDTH;
if (mv_lcu_row_reach_1 > cur_lcu_row + max_px_below_lcu || mv_lcu_row_reach_2 > cur_lcu_row + max_px_below_lcu) {
continue; continue;
} }
} }
@ -1448,6 +1441,13 @@ static int search_pu_inter(const encoder_state_t * const state,
FREE_POINTER(templcu); FREE_POINTER(templcu);
} }
if (cur_cu->inter.cost < INT_MAX) {
const vector2d_t orig = { x, y };
if (cur_cu->inter.mv_dir == 1) {
assert(fracmv_within_tile(state, &orig, cur_cu->inter.mv[0][0], cur_cu->inter.mv[0][1], width, -1));
}
}
return cur_cu->inter.cost; return cur_cu->inter.cost;
} }