commit d0a2988dbdfd5b22ec45bae2eead94d8347350fd
author Alex Converse <aconverse@google.com> Tue Apr 01 13:49:26 2014 -0700
committer Gerrit Code Review <gerrit@gerrit.golo.chromium.org> Tue Apr 01 13:49:26 2014 -0700
tree f97a08813f6e83517f7b7b3ed7d57df52186dba5
parent a860f0f6d5e333b7172f8124d0a84e6ba3d573f2
parent 12dd53d06a895a188ac491751e5c21acc12f42e8

Merge "Propagate active map state."

vp9/encoder/vp9_encodeframe.c

diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c
index 76e74b7..80abb1f 100644
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -1382,6 +1382,7 @@
     for (block_col = 0; block_col < 8; ++block_col) {
       MODE_INFO *const prev_mi = prev_mi_8x8[block_row * mis + block_col];
       const BLOCK_SIZE sb_type = prev_mi ? prev_mi->mbmi.sb_type : 0;
+
       if (prev_mi) {
         const ptrdiff_t offset = prev_mi - cm->prev_mi;
         mi_8x8[block_row * mis + block_col] = cm->mi + offset;

vp9/encoder/vp9_onyx_if.c

diff --git a/vp9/encoder/vp9_onyx_if.c b/vp9/encoder/vp9_onyx_if.c
index 0808ec4..f112fa2 100644
--- a/vp9/encoder/vp9_onyx_if.c
+++ b/vp9/encoder/vp9_onyx_if.c
@@ -2673,6 +2673,8 @@
   vp9_write_yuv_frame(cpi->Source);
 #endif
 
+  set_speed_features(cpi);
+
   // Decide q and q bounds.
   q = vp9_rc_pick_q_and_bounds(cpi, &bottom_index, &top_index);
 
@@ -2682,8 +2684,6 @@
     set_high_precision_mv(cpi, q < HIGH_PRECISION_MV_QTHRESH);
   }
 
-  set_speed_features(cpi);
-
   if (cpi->sf.recode_loop == DISALLOW_RECODE) {
     encode_without_recode_loop(cpi, size, dest, q);
   } else {

vp9/encoder/vp9_ratectrl.c

diff --git a/vp9/encoder/vp9_ratectrl.c b/vp9/encoder/vp9_ratectrl.c
index c62d312..3c8baad 100644
--- a/vp9/encoder/vp9_ratectrl.c
+++ b/vp9/encoder/vp9_ratectrl.c
@@ -985,6 +985,9 @@
       q /= 3;
     if (q == 0)
       q++;
+    if (cpi->sf.partition_check == 1)
+      q -= 10;
+
     if (q < *bottom_index)
       *bottom_index = q;
     else if (q > *top_index)