Merge changes I121fe66c,I94f57f8a

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

diff --cc vp9/encoder/vp9_encodeframe.c
index 5432c1f4529ae87532736b8d17f1a4eea98d3a1b,d189da0bb5cecc5fc9a9e0bfb3fcd6061f9b0c1f..5585428d94846f84534db8f5a1bb64c21123e329
--- 1/vp9/encoder/vp9_encodeframe.c
--- 2/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;

diff --cc vp9/encoder/vp9_firstpass.c
Simple merge

diff --cc vp9/encoder/vp9_onyx_if.c
Simple merge