commit 9d76b139c504527c2dc27c9e6d4f5984ed121ca6
author Thomas Daede <tdaede@mozilla.com> Tue Mar 20 09:49:23 2018 -0700
committer Yaowu Xu <yaowu@google.com> Wed Mar 21 13:43:05 2018 +0000
tree 24f383ef80439b4c0a4891138f995519ddb00968
parent 5997c7dd450a8f7b657a9ca29428c3e6e9e1089c

[NORMATIVE] CDF_UPDATE_MODE: Expand might_bwd_adapt condition.

If we disable CDF updates, the refresh_frame_context bit doesn't
have any effect, so we can save a bit my not coding it in this case.

BUG=aomedia:1622

Change-Id: I99fea6490fbac3b9ba76d4e59df8832febfb16cf

av1/decoder/decodeframe.c

diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index c15c9dc..0b0a818 100644
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -2965,7 +2965,12 @@
                        " state");
   }
 
+#if CONFIG_CDF_UPDATE_MODE
+  const int might_bwd_adapt =
+      !(cm->large_scale_tile) && !(cm->disable_cdf_update);
+#else
   const int might_bwd_adapt = !(cm->large_scale_tile);
+#endif
   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 21fab22..9ddfbc2 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -3184,7 +3184,12 @@
   if (cm->seq_params.frame_id_numbers_present_flag)
     cm->refresh_mask = get_refresh_mask(cpi);
 
+#if CONFIG_CDF_UPDATE_MODE
+  const int might_bwd_adapt =
+      !(cm->large_scale_tile) && !(cm->disable_cdf_update);
+#else
   const int might_bwd_adapt = !(cm->large_scale_tile);
+#endif
   if (might_bwd_adapt) {
     aom_wb_write_bit(
         wb, cm->refresh_frame_context == REFRESH_FRAME_CONTEXT_DISABLED);