Fixed cost calculations in fme

This commit is contained in:
Tapio Katajisto 2014-05-15 03:42:42 +00:00
parent cc92cfee18
commit 4d879945b2

View file

@ -459,8 +459,6 @@ static unsigned search_frac( const encoder_state * const encoder_state,
cost = satd(tmp_pic,tmp_filtered); cost = satd(tmp_pic,tmp_filtered);
cost = cost>>1;
cost += calc_mvd_cost(encoder_state, mv.x + pattern->x, mv.y + pattern->y, 1, mv_cand,merge_cand,num_cand,ref_idx, &bitcost); cost += calc_mvd_cost(encoder_state, mv.x + pattern->x, mv.y + pattern->y, 1, mv_cand,merge_cand,num_cand,ref_idx, &bitcost);
if (cost < best_cost) { if (cost < best_cost) {
@ -501,8 +499,6 @@ static unsigned search_frac( const encoder_state * const encoder_state,
cost = satd(tmp_pic,tmp_filtered); cost = satd(tmp_pic,tmp_filtered);
cost = cost>>1;
cost += calc_mvd_cost(encoder_state, mv.x + pattern->x, mv.y + pattern->y, 0, mv_cand,merge_cand,num_cand,ref_idx, &bitcost); cost += calc_mvd_cost(encoder_state, mv.x + pattern->x, mv.y + pattern->y, 0, mv_cand,merge_cand,num_cand,ref_idx, &bitcost);
if (cost < best_cost) { if (cost < best_cost) {