commit 592d73ec2ca9e85bc38198c74b222764b4ee216d
author Zoe Liu <zoeliu@google.com> Tue Feb 20 14:06:44 2018 -0800
committer Zoe Liu <zoeliu@google.com> Wed Feb 21 01:06:31 2018 +0000
tree a500df8cff096d15a9eb8edf4f0c91a260c07675
parent 66b98991294d96a86fb99a441511fe258d70c7b6

[NORMATIVE] Error resilience overrules refs signaling

For FRAME_REFS_SIGNALING, when error resilience mode is on for inter
frames, no frame refs signaling options will be provided. Hence no
additional bit is added and the reference frame signaling stays the
same as baseline.

BUG=aomedia:1392

Change-Id: I8ff9688c278373acaae3ee4fb74e9a392132f54d

av1/decoder/decodeframe.c

diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index 1cf9752..e7f6914 100644
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -2987,7 +2987,9 @@
       }
 
 #if CONFIG_FRAME_REFS_SIGNALING
-      cm->frame_refs_short_signaling = aom_rb_read_bit(rb);
+      // Frame refs short signaling is off when error resilient mode is on.
+      if (!cm->error_resilient_mode)
+        cm->frame_refs_short_signaling = aom_rb_read_bit(rb);
 
       if (cm->frame_refs_short_signaling) {
         // == LAST_FRAME ==