Merge "Update to speed 5 non-rd mode partition search."
This commit is contained in:
commit
155b9416b3
@ -3349,7 +3349,12 @@ static void nonrd_select_partition(VP9_COMP *cpi,
|
|||||||
subsize = (bsize >= BLOCK_8X8) ? mi[0]->mbmi.sb_type : BLOCK_4X4;
|
subsize = (bsize >= BLOCK_8X8) ? mi[0]->mbmi.sb_type : BLOCK_4X4;
|
||||||
partition = partition_lookup[bsl][subsize];
|
partition = partition_lookup[bsl][subsize];
|
||||||
|
|
||||||
if (bsize == BLOCK_32X32 && partition != PARTITION_NONE &&
|
if (bsize == BLOCK_32X32 && subsize == BLOCK_32X32) {
|
||||||
|
x->max_partition_size = BLOCK_32X32;
|
||||||
|
x->min_partition_size = BLOCK_16X16;
|
||||||
|
nonrd_pick_partition(cpi, td, tile_data, tp, mi_row, mi_col, bsize,
|
||||||
|
rd_cost, 0, INT64_MAX, pc_tree);
|
||||||
|
} else if (bsize == BLOCK_32X32 && partition != PARTITION_NONE &&
|
||||||
subsize >= BLOCK_16X16) {
|
subsize >= BLOCK_16X16) {
|
||||||
x->max_partition_size = BLOCK_32X32;
|
x->max_partition_size = BLOCK_32X32;
|
||||||
x->min_partition_size = BLOCK_8X8;
|
x->min_partition_size = BLOCK_8X8;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user