Merge "Fix bug in setting sf->use_square_partition_only."

This commit is contained in:
Yaowu Xu
2015-07-21 01:24:52 +00:00
committed by Gerrit Code Review

View File

@@ -118,10 +118,11 @@ static void set_good_speed_feature(VP9_COMP *cpi, VP9_COMMON *cm,
if (speed >= 1) {
if ((cpi->twopass.fr_content_type == FC_GRAPHICS_ANIMATION) ||
vp9_internal_image_edge(cpi)) {
sf->use_square_partition_only = frame_is_boosted(cpi);
sf->use_square_partition_only = !frame_is_boosted(cpi);
} else {
sf->use_square_partition_only = !frame_is_intra_only(cm);
}
sf->less_rectangular_check = 1;
sf->use_rd_breakout = 1;