commit 9a032fa2628ee55ec557d2c03fb09ead796eea3d
author Vignesh Venkatasubramanian <vigneshv@google.com> Sat Oct 22 02:23:05 2016
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Oct 22 02:23:06 2016
tree 236471a33ee91d5d82a420ca7ff54c61f1cb2462
parent ee1b3f34c032f6ec8fe2bb0e899ae03234fd98c6
parent 5deffa1175420c09b89e998b60bf3e26f8379397

Merge "vp9_bitstream: Encode tiles in parallel"

vp9/encoder/vp9_encodeframe.c

diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c
index 36e288e..aff7b1d 100644
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -799,6 +799,7 @@
   int min_var_32x32 = INT_MAX;
   int var_32x32;
   int avg_16x16[4];
+  int64_t threshold_4x4avg;
   NOISE_LEVEL noise_level = kLow;
   uint8_t *s;
   const uint8_t *d;
@@ -833,6 +834,9 @@
     }
   }
 
+  threshold_4x4avg =
+      (cpi->oxcf.speed < 8) ? thresholds[1] << 1 : thresholds[2] >> 1;
+
   memset(x->variance_low, 0, sizeof(x->variance_low));
 
   if (xd->mb_to_right_edge < 0) pixels_wide += (xd->mb_to_right_edge >> 3);
@@ -999,7 +1003,7 @@
       }
       if (is_key_frame || (low_res &&
                            vt.split[i].split[j].part_variances.none.variance >
-                               (thresholds[1] << 1))) {
+                               threshold_4x4avg)) {
         force_split[split_index] = 0;
         // Go down to 4x4 down-sampling for variance.
         variance4x4downsample[i2 + j] = 1;

vp9/encoder/vp9_speed_features.c

diff --git a/vp9/encoder/vp9_speed_features.c b/vp9/encoder/vp9_speed_features.c
index 6cbb59f..3e1ed50 100644
--- a/vp9/encoder/vp9_speed_features.c
+++ b/vp9/encoder/vp9_speed_features.c
@@ -508,7 +508,6 @@
       sf->short_circuit_low_temp_var = 2;
     }
     sf->limit_newmv_early_exit = 0;
-    sf->bias_golden = 0;
   }
 }