commit 365eae82ad1f2d81f13129356effdce8f926526c
author Debargha Mukherjee <debargha@google.com> Mon Mar 26 19:19:55 2018 -0700
committer Yue Chen <yuec@google.com> Tue Mar 27 03:49:38 2018 +0000
tree f05c88fa9037cbfc23fbabce47c432137244c31d
parent 1f77147065ca1f945570c201f7ce73b55ac26ce4

[NORMATIVE] Seq level filter_intra/intra_edge flags

No need to have filter_intra and intra_edge_filter flags
at frame level. It is sufficient to have these at the seq
level only. This also saves two bits per frame.

BUG=aomedia:1661

Change-Id: I92576db66d370ba2652f7bdc502c28883e90a4f4

av1/decoder/decodeframe.c

diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index 3e0afdc..e3bc813 100644
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -2309,6 +2309,9 @@
 
   setup_sb_size(seq_params, rb);
 
+  seq_params->enable_filter_intra = aom_rb_read_bit(rb);
+  seq_params->enable_intra_edge_filter = aom_rb_read_bit(rb);
+
   seq_params->enable_interintra_compound = aom_rb_read_bit(rb);
   seq_params->enable_masked_compound = aom_rb_read_bit(rb);
   seq_params->enable_warped_motion = aom_rb_read_bit(rb);
@@ -2656,8 +2659,6 @@
 #endif
   cm->intra_only = cm->frame_type == INTRA_ONLY_FRAME;
   cm->error_resilient_mode = frame_is_sframe(cm) ? 1 : aom_rb_read_bit(rb);
-  cm->enable_intra_edge_filter = aom_rb_read_bit(rb);
-  cm->allow_filter_intra = aom_rb_read_bit(rb);
 
 #if CONFIG_CDF_UPDATE_MODE
   cm->disable_cdf_update = aom_rb_read_bit(rb);