Merge "Fix bug when overlaying middle arfs in multi-arf groups."

This commit is contained in:
Paul Wilkins 2015-12-04 10:33:55 +00:00 committed by Gerrit Code Review
commit 2b5baea8fd

View File

@ -1257,8 +1257,12 @@ static void update_golden_frame_stats(VP9_COMP *cpi) {
rc->frames_since_golden = 0;
// If we are not using alt ref in the up and coming group clear the arf
// active flag.
if (!rc->source_alt_ref_pending) {
// active flag. In multi arf group case, if the index is not 0 then
// we are overlaying a mid group arf so should not reset the flag.
if (cpi->oxcf.pass == 2) {
if (!rc->source_alt_ref_pending && (cpi->twopass.gf_group.index == 0))
rc->source_alt_ref_active = 0;
} else if (!rc->source_alt_ref_pending) {
rc->source_alt_ref_active = 0;
}