commit 913862be8c3f0ae626914cbcff98f49f50ef4ed1
author Marco <marpan@google.com> Mon May 11 09:38:02 2015 -0700
committer Marco <marpan@google.com> Mon May 11 10:04:18 2015 -0700
tree 4cad94ff1d70d31d107cabf87b869cb06c4e5fdd
parent aa5c1b4c5d80991e4b48dd302d3ec5f1a97552e8

Fix rate control issue with layers and aq-mode=3.

When aq-mode=3 is enabled, only for base layer frames should the
qp of the frame incorporate the segment delta-qp.

This was causing more rate mismatch for the enhancement layer frames
when running temporal layers with aq-mode=3 on.

Change-Id: I1c5e69d1ef8a51188af8696753c17fd8f67699b3

vp9/encoder/vp9_ratectrl.c

diff --git a/vp9/encoder/vp9_ratectrl.c b/vp9/encoder/vp9_ratectrl.c
index 4c33ffd..7ddb635 100644
--- a/vp9/encoder/vp9_ratectrl.c
+++ b/vp9/encoder/vp9_ratectrl.c
@@ -491,7 +491,10 @@
   i = active_best_quality;
 
   do {
-    if (cpi->oxcf.aq_mode == CYCLIC_REFRESH_AQ && cm->seg.enabled) {
+    if (cpi->oxcf.aq_mode == CYCLIC_REFRESH_AQ &&
+        cm->seg.enabled &&
+        cpi->svc.temporal_layer_id == 0 &&
+        cpi->svc.spatial_layer_id == 0) {
       bits_per_mb_at_this_q =
           (int)vp9_cyclic_refresh_rc_bits_per_mb(cpi, i, correction_factor);
     } else {