Merge "Allow key frame more flexibility in mode search"
This commit is contained in:
commit
48b8ce21f0
@ -1277,9 +1277,6 @@ static int64_t rd_pick_intra_sby_mode(VP9_COMP *cpi, MACROBLOCK *x,
|
||||
MODE_INFO *above_mi = xd->mi[-xd->mi_stride];
|
||||
MODE_INFO *left_mi = xd->left_available ? xd->mi[-1] : NULL;
|
||||
|
||||
if (!(cpi->sf.intra_y_mode_mask[max_txsize_lookup[bsize]] & (1 << mode)))
|
||||
continue;
|
||||
|
||||
if (cpi->common.frame_type == KEY_FRAME) {
|
||||
const PREDICTION_MODE A = vp9_above_block_mode(mic, above_mi, 0);
|
||||
const PREDICTION_MODE L = vp9_left_block_mode(mic, left_mi, 0);
|
||||
|
@ -249,6 +249,8 @@ static void set_rt_speed_feature(VP9_COMP *cpi, SPEED_FEATURES *sf,
|
||||
}
|
||||
|
||||
if (speed >= 5) {
|
||||
sf->auto_min_max_partition_size = (cm->frame_type == KEY_FRAME) ?
|
||||
RELAXED_NEIGHBORING_MIN_MAX : STRICT_NEIGHBORING_MIN_MAX;
|
||||
sf->max_partition_size = BLOCK_32X32;
|
||||
sf->min_partition_size = BLOCK_8X8;
|
||||
sf->partition_check =
|
||||
|
Loading…
x
Reference in New Issue
Block a user