From: Marco Paniconi <marpan@google.com>
Date: Tue, 4 Mar 2014 02:51:32 +0000 (-0800)
Subject: Avoid gf/altref boost in pick_q under svc cbr mode.
X-Git-Tag: v1.4.0~2165
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=02b8baf35e76bbb04effa5dee5ca16e2898e7af8;p=libvpx

Avoid gf/altref boost in pick_q under svc cbr mode.

Change-Id: Ib719a9f74924718715592e0238bc391ae239d026
---

diff --git a/vp9/encoder/vp9_ratectrl.c b/vp9/encoder/vp9_ratectrl.c
index 89aa82140..8430e4b64 100644
--- a/vp9/encoder/vp9_ratectrl.c
+++ b/vp9/encoder/vp9_ratectrl.c
@@ -587,6 +587,7 @@ static int rc_pick_q_and_bounds_one_pass_cbr(const VP9_COMP *cpi,
                                                    q_adj_factor);
     }
   } else if (!rc->is_src_frame_alt_ref &&
+             !cpi->use_svc &&
              (cpi->refresh_golden_frame || cpi->refresh_alt_ref_frame)) {
     // Use the lower of active_worst_quality and recent
     // average Q as basis for GF/ARF best Q limit unless last frame was