Merge "Allow sub8x8 intra modes test for alt frame coding"

This commit is contained in:
Jingning Han 2013-10-10 09:00:08 -07:00 committed by Gerrit Code Review
commit 4793324c16

View File

@ -776,7 +776,8 @@ void vp9_set_speed_features(VP9_COMP *cpi) {
? USE_FULL_RD : USE_LARGESTALL;
if (MIN(cpi->common.width, cpi->common.height) >= 720)
sf->disable_split_mask = DISABLE_ALL_SPLIT;
sf->disable_split_mask = cpi->common.show_frame ?
DISABLE_ALL_SPLIT : DISABLE_ALL_INTER_SPLIT;
else
sf->disable_split_mask = DISABLE_COMPOUND_SPLIT;
@ -794,10 +795,12 @@ void vp9_set_speed_features(VP9_COMP *cpi) {
? USE_FULL_RD : USE_LARGESTALL);
if (MIN(cpi->common.width, cpi->common.height) >= 720)
sf->disable_split_mask = DISABLE_ALL_SPLIT;
sf->disable_split_mask = cpi->common.show_frame ?
DISABLE_ALL_SPLIT : DISABLE_ALL_INTER_SPLIT;
else
sf->disable_split_mask = LAST_AND_INTRA_SPLIT_ONLY;
sf->mode_search_skip_flags = FLAG_SKIP_INTRA_DIRMISMATCH |
FLAG_SKIP_INTRA_BESTINTER |
FLAG_SKIP_COMP_BESTINTRA |