ref: ea2a5754b4bc25dbb4ce5eb03bd632dfd756540c
parent: 1b70862916bc33e372f95c725bd24947b0afb308
parent: 9c8ad79fdc8af25988dd071703a51d379f2849ce
author: John Koleszar <jkoleszar@google.com>
date: Thu Dec 2 03:20:43 EST 2010
Merge remote branch 'origin/master' into experimental Change-Id: If95cb994d898d3f29b28db0d118a1f9c973e88d9
--- a/vp8/encoder/onyx_if.c
+++ b/vp8/encoder/onyx_if.c
@@ -4583,7 +4583,7 @@
}
else
{- if (cpi->oxcf.play_alternate && cpi->common.refresh_alt_ref_frame)
+ if (cpi->oxcf.play_alternate && cpi->common.refresh_alt_ref_frame && (cpi->common.frame_type != KEY_FRAME))
// Update the alternate reference frame and stats as appropriate.
update_alt_ref_frame_and_stats(cpi);
else
--- a/vp8/encoder/ratectrl.c
+++ b/vp8/encoder/ratectrl.c
@@ -326,6 +326,7 @@
cpi->frames_till_gf_update_due = cpi->goldfreq;
cpi->common.refresh_golden_frame = TRUE;
+ cpi->common.refresh_alt_ref_frame = TRUE;
}
void vp8_calc_auto_iframe_target_size(VP8_COMP *cpi)