From: Paul Wilkins <paulwilkins@google.com>
Date: Thu, 13 Feb 2014 17:31:53 +0000 (-0800)
Subject: Merge changes I121fe66c,I94f57f8a
X-Git-Tag: v1.4.0~2392
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d84978b84fc8f3b329e60b77d4180000136b81f2;p=platform%2Fupstream%2Flibvpx.git

Merge changes I121fe66c,I94f57f8a

* changes:
  Remove some cases for turning off arf.
  Modified Aq1 and Aq2
---

d84978b84fc8f3b329e60b77d4180000136b81f2
diff --cc vp9/encoder/vp9_encodeframe.c
index 5432c1f,d189da0..5585428
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@@ -361,12 -362,9 +361,10 @@@ static void select_in_frame_q_segment(V
    } else {
      // Rate depends on fraction of a SB64 in frame (xmis * ymis / bw * bh).
      // It is converted to bits * 256 units
 -    target_rate = (cpi->rc.sb64_target_rate * xmis * ymis * 256) / (bw * bh);
 +    const int target_rate = (cpi->rc.sb64_target_rate * xmis * ymis * 256) /
 +                            (bw * bh);
  
      if (projected_rate < (target_rate / 4)) {
-       segment = 2;
-     } else if (projected_rate < (target_rate / 2)) {
        segment = 1;
      } else {
        segment = 0;