commit 47aaf8776e876529427c27c88bc11be6c0dd66d9
author Jingning Han <jingning@google.com> Sun Jul 21 14:56:32 2019 -0700
committer Jingning Han <jingning@google.com> Mon Jul 22 21:04:52 2019 +0000
tree 327a193616c4ff47cbdfc33f9f23de3fd67cf725
parent 31a0ee9527522f9aecd69997eaf5aa88a62cd0cf

Fix unit test failure for S-frame

Handle the S-frame case in the new arf stack based reference
frame management system.

BUG=aomedia:2438

Change-Id: I6000f19f7c696d8ba337db910654b1830506fa06

av1/encoder/encode_strategy.c

diff --git a/av1/encoder/encode_strategy.c b/av1/encoder/encode_strategy.c
index 6c5fcd1..fad2562 100644
--- a/av1/encoder/encode_strategy.c
+++ b/av1/encoder/encode_strategy.c
@@ -818,6 +818,11 @@
                               int ref_map_index,
                               RefBufferStack *ref_buffer_stack) {
   AV1_COMMON *const cm = &cpi->common;
+  // TODO(jingning): Consider the S-frame same as key frame for the
+  // reference frame tracking purpose. The logic might be better
+  // expressed than converting the frame update type.
+  if (frame_is_sframe(cm)) frame_update_type = KEY_FRAME;
+
   switch (frame_update_type) {
     case KEY_FRAME:
       stack_reset(ref_buffer_stack->lst_stack,