Merge "Allow disable of refresh golden for more than 1 layer encoding."

343acaa8 · Marco · Gerrit Code Review · 0ca5908f · d6b68837 · 343acaa8
Commit 343acaa8 authored Nov 03, 2014 by Marco Committed by Gerrit Code Review Nov 03, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

vp9/encoder/vp9_encoder.c vp9/encoder/vp9_encoder.c +3 -1

No files found.
--- a/vp9/encoder/vp9_encoder.c
+++ b/vp9/encoder/vp9_encoder.c
@@ -2983,7 +2983,9 @@ static int get_ref_frame_flags(const VP9_COMP *cpi) {
  if (gold_is_last)
    flags &= ~VP9_GOLD_FLAG;

-  if (cpi->rc.frames_till_gf_update_due == INT_MAX && !is_two_pass_svc(cpi))
+  if (cpi->rc.frames_till_gf_update_due == INT_MAX &&
+      (cpi->svc.number_temporal_layers == 1 &&
+       cpi->svc.number_spatial_layers == 1))
    flags &= ~VP9_GOLD_FLAG;

  if (alt_is_last)