diff options
| author | Yaowu Xu <yaowu@google.com> | 2015-07-21 01:24:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-07-21 01:24:53 +0000 |
| commit | d41781560e69adc1b18ad40a5bfd8ab88cb6d98f (patch) | |
| tree | 6ce9afa5a721bc879b0b66872b0273083c731213 /vp9/encoder | |
| parent | b8c47a98b8ab00eb2ffa33311080a4a6ac97e15b (diff) | |
| parent | 7d15444d0708cd1ff39fdec4405fd0b835d21bde (diff) | |
| download | libvpx-d41781560e69adc1b18ad40a5bfd8ab88cb6d98f.tar libvpx-d41781560e69adc1b18ad40a5bfd8ab88cb6d98f.tar.gz libvpx-d41781560e69adc1b18ad40a5bfd8ab88cb6d98f.tar.bz2 libvpx-d41781560e69adc1b18ad40a5bfd8ab88cb6d98f.zip | |
Merge "Fix bug in setting sf->use_square_partition_only."
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_speed_features.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/vp9/encoder/vp9_speed_features.c b/vp9/encoder/vp9_speed_features.c index e544f9bb4..bf06fd0ea 100644 --- a/vp9/encoder/vp9_speed_features.c +++ b/vp9/encoder/vp9_speed_features.c @@ -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; |