generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Yaowu Xu
2015-07-21 01:24:52 +00:00
committed by Gerrit Code Review
parent b8c47a98b8 7d15444d07
commit d41781560e
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
vp9/encoder/vp9_speed_features.c
View File

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