From: Paul Wilkins <paulwilkins@google.com>
Date: Thu, 26 Jun 2014 10:26:25 +0000 (+0100)
Subject: Multi-arf: Change ref buffer for primary arf.
X-Git-Tag: v1.4.0~1323^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1d5223c6277cfcd7cbee5d3855c25c8cc3d29c75;p=libvpx

Multi-arf: Change ref buffer for primary arf.

For the primary arf in a group, if multiple arfs
are enabled and we were using arfs in the previous
group, then allow the second arf from the previous
group to be used as an additional reference.

Change-Id: Iaf41706a52f54ef21548026851cd77100d6aebda
---

diff --git a/vp9/encoder/vp9_firstpass.c b/vp9/encoder/vp9_firstpass.c
index d0dd18213..971b15931 100644
--- a/vp9/encoder/vp9_firstpass.c
+++ b/vp9/encoder/vp9_firstpass.c
@@ -1360,7 +1360,8 @@ static void allocate_gf_group_bits(VP9_COMP *cpi, int64_t gf_group_bits,
     twopass->gf_group.arf_src_offset[frame_index] =
       (unsigned char)(rc->baseline_gf_interval - 1);
     twopass->gf_group.arf_update_idx[frame_index] = arf_buffer_indices[0];
-    twopass->gf_group.arf_ref_idx[frame_index] = arf_buffer_indices[0];
+    twopass->gf_group.arf_ref_idx[frame_index] =
+      arf_buffer_indices[cpi->multi_arf_enabled && rc->source_alt_ref_active];
     ++frame_index;
 
     if (cpi->multi_arf_enabled) {