ref: cb51192b5106e5e2c0570ace106b7a12c6cbc2cd
parent: 1a30f701451639fea2200d8dd58d65e4f89860a9
parent: 1d5223c6277cfcd7cbee5d3855c25c8cc3d29c75
author: Yaowu Xu <yaowu@google.com>
date: Fri Jun 27 03:07:02 EDT 2014
Merge "Multi-arf: Change ref buffer for primary arf."
--- a/vp9/encoder/vp9_firstpass.c
+++ b/vp9/encoder/vp9_firstpass.c
@@ -1360,7 +1360,8 @@
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) {