commit 229fdc84d3e9e6b2a28c60518033b8e5835b7def
author Debargha Mukherjee <debargha@google.com> Sat Mar 10 07:45:33 2018 -0800
committer Debargha Mukherjee <debargha@google.com> Fri Mar 16 05:19:15 2018 +0000
tree 9701901693494b41cc4a978edcb823cffaec34ad
parent f65e5ba70cb873820399e6ad42b9aaeead203f69

[NORMATIVE] Frame context refresh error-resilience

There is no reason to turn off backward update in
error resilience mode.

Change-Id: I75b805eb1a930dc5fd8e4f1fbfc4013ca2205408

av1/decoder/decodeframe.c

diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index 6780574..80436e9 100644
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -3096,8 +3096,7 @@
                        " state");
   }
 
-  const int might_bwd_adapt =
-      !(cm->error_resilient_mode || cm->large_scale_tile);
+  const int might_bwd_adapt = !(cm->large_scale_tile);
   if (might_bwd_adapt) {
     cm->refresh_frame_context = aom_rb_read_bit(rb)
                                     ? REFRESH_FRAME_CONTEXT_DISABLED

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index eecb9ff..94fad31 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -3259,9 +3259,7 @@
         cm->frame_type == KEY_FRAME ? 0xFF : get_refresh_mask(cpi);
   }
 
-  const int might_bwd_adapt =
-      !(cm->error_resilient_mode || cm->large_scale_tile);
-
+  const int might_bwd_adapt = !(cm->large_scale_tile);
   if (might_bwd_adapt) {
     aom_wb_write_bit(
         wb, cm->refresh_frame_context == REFRESH_FRAME_CONTEXT_DISABLED);

av1/encoder/encoder.c

diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c
index 46e5f85..12e3b79 100644
--- a/av1/encoder/encoder.c
+++ b/av1/encoder/encoder.c
@@ -2470,10 +2470,9 @@
   cpi->refresh_bwd_ref_frame = 0;
   cpi->refresh_alt2_ref_frame = 0;
 
-  cm->refresh_frame_context =
-      (oxcf->error_resilient_mode || oxcf->frame_parallel_decoding_mode)
-          ? REFRESH_FRAME_CONTEXT_DISABLED
-          : REFRESH_FRAME_CONTEXT_BACKWARD;
+  cm->refresh_frame_context = (oxcf->frame_parallel_decoding_mode)
+                                  ? REFRESH_FRAME_CONTEXT_DISABLED
+                                  : REFRESH_FRAME_CONTEXT_BACKWARD;
   if (oxcf->large_scale_tile)
     cm->refresh_frame_context = REFRESH_FRAME_CONTEXT_DISABLED;