Commit 954dbb28 authored by Deb Mukherjee's avatar Deb Mukherjee Committed by Gerrit Code Review
Browse files

Merge "Preliminary code for variance based paritioning"

parents 9d8703d5 e39ecfaa
This diff is collapsed.
......@@ -866,7 +866,7 @@ int vp9_square_search(const MACROBLOCK *x,
do_init_search, 0, vfp, use_mvcost,
center_mv, best_mv,
square_num_candidates, square_candidates);
};
}
int vp9_fast_hex_search(const MACROBLOCK *x,
MV *ref_mv,
......
......@@ -875,7 +875,7 @@ static void set_rt_speed_feature(VP9_COMMON *cm,
if (speed >= 8) {
int i;
for (i = 0; i < BLOCK_SIZES; ++i)
sf->disable_inter_mode_mask[i] = 14; // only search NEARESTMV (0)
sf->disable_inter_mode_mask[i] = 14; // only search NEARESTMV (0)
}
}
......
......@@ -250,7 +250,6 @@ int64_t vp9_pick_inter_mode(VP9_COMP *cpi, MACROBLOCK *x,
x->skip = 0;
if (!x->in_active_map)
x->skip = 1;
// initialize mode decisions
*returnrate = INT_MAX;
*returndistortion = INT64_MAX;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment