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

Added motion vector candidate selector

Browse source
This commit is contained in:
Marko Viitanen 2013-09-16 16:51:13 +03:00
parent 8e776366dc
commit 6a4011a90a
1 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/encoder.c
View file

@ -1036,7 +1036,18 @@ void encode_coding_tree(encoder_control* encoder,uint16_t xCtb,uint16_t yCtb, ui
/* Get MV candidates */ /* Get MV candidates */
inter_get_mv_cand(encoder, xCtb, yCtb, depth, mv_cand); inter_get_mv_cand(encoder, xCtb, yCtb, depth, mv_cand);
cur_CU->inter.mv_ref = 0;
/* Select better candidate */
cur_CU->inter.mv_ref = 0; /* Default to candidate 0
/* Only check when candidates are different */
if (mv_cand[0][0] != mv_cand[1][0] || mv_cand[0][1] != mv_cand[1][1]) {
uint16_t cand_1_diff = abs(cur_CU->inter.mv[0]-mv_cand[0][0]) + abs(cur_CU->inter.mv[1]-mv_cand[0][1]);
uint16_t cand_2_diff = abs(cur_CU->inter.mv[0]-mv_cand[1][0]) + abs(cur_CU->inter.mv[1]-mv_cand[1][1]);
/* Select candidate 1 if it's closer */
if (cand_2_diff < cand_1_diff) {
cur_CU->inter.mv_ref = 1;
}
}
if (!(/*pcCU->getSlice()->getMvdL1ZeroFlag() &&*/ encoder->ref_list == REF_PIC_LIST_1 && cur_CU->inter.mv_dir==3)) if (!(/*pcCU->getSlice()->getMvdL1ZeroFlag() &&*/ encoder->ref_list == REF_PIC_LIST_1 && cur_CU->inter.mv_dir==3))
{ {
@ -1087,13 +1098,8 @@ void encode_coding_tree(encoder_control* encoder,uint16_t xCtb,uint16_t yCtb, ui
/* Mark this block as "coded" (can be used for predictions..) */ /* Mark this block as "coded" (can be used for predictions..) */
picture_setBlockCoded(encoder->in.cur_pic,xCtb, yCtb, depth, 1); picture_setBlockCoded(encoder->in.cur_pic,xCtb, yCtb, depth, 1);
} }
{
/* Signal which candidate MV to use */ /* Signal which candidate MV to use */
int32_t iSymbol = cur_CU->inter.mv_ref; cabac_writeUnaryMaxSymbol(&cabac,g_cMVPIdxSCModel, cur_CU->inter.mv_ref,1,AMVP_MAX_NUM_CANDS-1);
int32_t iNum = AMVP_MAX_NUM_CANDS;
cabac_writeUnaryMaxSymbol(&cabac,g_cMVPIdxSCModel, iSymbol,1,iNum-1);
}
} }
} }
} }