ref: 4793324c16c9f1c204049d2831f45e3636732d9d
parent: c317fbd6cf3aa063d9945e822c27b4d59efc9c09
parent: 0d0ed6a29b6e594e40fad9bcdaca5dab822754ce
author: Jingning Han <jingning@google.com>
date: Thu Oct 10 05:00:08 EDT 2013
Merge "Allow sub8x8 intra modes test for alt frame coding"
--- a/vp9/encoder/vp9_onyx_if.c
+++ b/vp9/encoder/vp9_onyx_if.c
@@ -776,7 +776,8 @@
? 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,9 +795,11 @@
? 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 |