Enable Nx2N partitions.

This commit is contained in:
Arttu Ylä-Outinen 2015-11-03 11:30:54 +02:00
parent 4402e251ae
commit 0f531362bf

View file

@ -541,13 +541,15 @@ static double search_cu(encoder_state_t * const state, int x, int y, int depth,
} }
if (depth < MAX_DEPTH) { if (depth < MAX_DEPTH) {
// Try SMP partitioning. // Try SMP partitioning.
static const part_mode_t smp_modes[] = {SIZE_2NxN, SIZE_Nx2N};
for (int i = 0; i < 2; ++i) {
mode_cost = kvz_search_cu_smp(state, mode_cost = kvz_search_cu_smp(state,
x, y, x, y,
depth, depth,
SIZE_2NxN, smp_modes[i],
&work_tree[depth + 1]); &work_tree[depth + 1]);
// TODO: take cost of coding part mode into account
if (mode_cost < cost) { if (mode_cost < cost) {
cost = mode_cost; cost = mode_cost;
// TODO: only copy inter prediction info, not pixels // TODO: only copy inter prediction info, not pixels
@ -555,6 +557,7 @@ static double search_cu(encoder_state_t * const state, int x, int y, int depth,
} }
} }
} }
}
// Try to skip intra search in rd==0 mode. // Try to skip intra search in rd==0 mode.
// This can be quite severe on bdrate. It might be better to do this // This can be quite severe on bdrate. It might be better to do this