commit 46ccbf471caddce2bec315210ff082b10a02f856
author Marco Paniconi <marpan@google.com> Mon Aug 05 11:23:02 2019 -0700
committer Marco Paniconi <marpan@google.com> Tue Aug 06 00:40:22 2019 +0000
tree 212c0be58fea367c68afcf7c9ed8c97745632d32
parent 008d3404bef92713c375d17f17a94548269ce852

rtc: Fix to get_ref_frame_flags for Golden ref

LAST2/3 are not used in fast nonrd_pickmode, so
condition the removal of golden reference on
fast nonrd mode.

Change-Id: I9365bceb3b223125651abf5d93cfc0cbe72cc19f

av1/encoder/encode_strategy.c

diff --git a/av1/encoder/encode_strategy.c b/av1/encoder/encode_strategy.c
index d73caf3..cbbdb60 100644
--- a/av1/encoder/encode_strategy.c
+++ b/av1/encoder/encode_strategy.c
@@ -327,9 +327,9 @@
 
   if (last3_is_last || last3_is_alt || last3_is_last2) flags &= ~AOM_LAST3_FLAG;
 
-  if (gld_is_last || gld_is_last2 || gld_is_last3) {
+  if (gld_is_last ||
+      (!cpi->sf.use_fast_nonrd_pick_mode && (gld_is_last2 || gld_is_last3)))
     flags &= ~AOM_GOLD_FLAG;
-  }
 
   if (!cpi->sf.use_fast_nonrd_pick_mode && gld_is_alt) {
     flags &= ~AOM_GOLD_FLAG;