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

Enable fractional motion vectors with bipred

Browse source
This commit is contained in:
Ari Lemmetti 2015-08-10 18:49:12 +03:00
parent 5887c96991
commit 7cd4f7a5c9
1 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/search_inter.c
View file

@ -1080,11 +1080,10 @@ int search_cu_inter(const encoder_state_t * const state, int x, int y, int depth
// Force L0 and L1 references // Force L0 and L1 references
if (state->global->refmap[merge_cand[i].ref[0]].list == 2 || state->global->refmap[merge_cand[j].ref[1]].list == 1) continue; if (state->global->refmap[merge_cand[i].ref[0]].list == 2 || state->global->refmap[merge_cand[j].ref[1]].list == 1) continue;
// TODO: enable fractional pixel bipred search mv[0][0] = merge_cand[i].mv[0][0];
mv[0][0] = merge_cand[i].mv[0][0] & 0xfff8; mv[0][1] = merge_cand[i].mv[0][1];
mv[0][1] = merge_cand[i].mv[0][1] & 0xfff8; mv[1][0] = merge_cand[j].mv[1][0];
mv[1][0] = merge_cand[j].mv[1][0] & 0xfff8; mv[1][1] = merge_cand[j].mv[1][1];
mv[1][1] = merge_cand[j].mv[1][1] & 0xfff8;
// Check boundaries when using owf to process multiple frames at the same time // Check boundaries when using owf to process multiple frames at the same time
if (max_lcu_below >= 0) { if (max_lcu_below >= 0) {
@ -1112,9 +1111,8 @@ int search_cu_inter(const encoder_state_t * const state, int x, int y, int depth
cost = satd(tmp_pic, tmp_block); cost = satd(tmp_pic, tmp_block);
// TODO: enable fractional pixel bipred search cost += calc_mvd_cost(state, merge_cand[i].mv[0][0], merge_cand[i].mv[0][1], 0, mv_cand, merge_cand, 0, ref_idx, &bitcost[0]);
cost += calc_mvd_cost(state, merge_cand[i].mv[0][0] & 0xfff8, merge_cand[i].mv[0][1] & 0xfff8, 0, mv_cand, merge_cand, 0, ref_idx, &bitcost[0]); cost += calc_mvd_cost(state, merge_cand[i].mv[1][0], merge_cand[i].mv[1][1], 0, mv_cand, merge_cand, 0, ref_idx, &bitcost[1]);
cost += calc_mvd_cost(state, merge_cand[i].mv[1][0] & 0xfff8, merge_cand[i].mv[1][1] & 0xfff8, 0, mv_cand, merge_cand, 0, ref_idx, &bitcost[1]);
if (cost < cur_cu->inter.cost) { if (cost < cur_cu->inter.cost) {
@ -1127,11 +1125,10 @@ int search_cu_inter(const encoder_state_t * const state, int x, int y, int depth
cur_cu->inter.mv_ref[0] = merge_cand[i].ref[0]; cur_cu->inter.mv_ref[0] = merge_cand[i].ref[0];
cur_cu->inter.mv_ref[1] = merge_cand[j].ref[1]; cur_cu->inter.mv_ref[1] = merge_cand[j].ref[1];
// TODO: enable fractional pixel bipred search cur_cu->inter.mv[0][0] = merge_cand[i].mv[0][0];
cur_cu->inter.mv[0][0] = merge_cand[i].mv[0][0] & 0xfff8; cur_cu->inter.mv[0][1] = merge_cand[i].mv[0][1];
cur_cu->inter.mv[0][1] = merge_cand[i].mv[0][1] & 0xfff8; cur_cu->inter.mv[1][0] = merge_cand[j].mv[1][0];
cur_cu->inter.mv[1][0] = merge_cand[j].mv[1][0] & 0xfff8; cur_cu->inter.mv[1][1] = merge_cand[j].mv[1][1];
cur_cu->inter.mv[1][1] = merge_cand[j].mv[1][1] & 0xfff8;
cur_cu->merged = 0; cur_cu->merged = 0;
// Check every candidate to find a match // Check every candidate to find a match