From: paulwilkins <paulwilkins@google.com>
Date: Thu, 16 Jul 2015 15:20:39 +0000 (+0100)
Subject: Fix bug in setting sf->use_square_partition_only.
X-Git-Tag: v1.5.0~422^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7d15444d0708cd1ff39fdec4405fd0b835d21bde;p=libvpx

Fix bug in setting sf->use_square_partition_only.

Fix bug in setting this flag for animated content.
The bug did cause quality to increase because far
more frames are not boosted than boosted.

However, the speed trade off to gain is a lot less
favorable and the behavior was not as intended.

Change-Id: I89fb70419c88b26f40b3534de0481730a1b3fcfa
---

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;