commit 00dcf5a161f7dabcc567dba6fa1ccdae83fefb3b
author Yue Chen <yuec@google.com> Fri Mar 09 14:31:47 2018 -0800
committer Yue Chen <yuec@google.com> Sat Mar 10 01:07:26 2018 +0000
tree 559ddc3dc8dfdc639377c46f540879f725d84a79
parent 03391a2d87fae6b2588eb15b2a11d4f8ba14009e

Rephase the frame level flag for intra_edge

Just for making it consistent with other flags.

Change-Id: I09b9e2271e798258c025ef5cbfd42bca3d816a9b

av1/common/onyxc_int.h

diff --git a/av1/common/onyxc_int.h b/av1/common/onyxc_int.h
index 7f23e11..1113b87 100644
--- a/av1/common/onyxc_int.h
+++ b/av1/common/onyxc_int.h
@@ -324,7 +324,7 @@
   int cur_frame_force_integer_mv;  // 0 the default in AOM, 1 only integer
 #endif
 
-  int disable_intra_edge_filter;  // 1 - disable corner/edge/upsampling
+  int enable_intra_edge_filter;  // 0 - disable corner/edge/upsampling
   int allow_screen_content_tools;
   int allow_intrabc;
   int allow_filter_intra;

av1/common/reconintra.c

diff --git a/av1/common/reconintra.c b/av1/common/reconintra.c
index 8bf6c37..c551888 100644
--- a/av1/common/reconintra.c
+++ b/av1/common/reconintra.c
@@ -1706,7 +1706,7 @@
       cm, bsize, mi_row, mi_col, bottom_available, have_left, partition,
       tx_size, row_off, col_off, pd->subsampling_x, pd->subsampling_y);
 
-  const int disable_edge_filter = cm->disable_intra_edge_filter;
+  const int disable_edge_filter = !cm->enable_intra_edge_filter;
   if (xd->cur_buf->flags & YV12_FLAG_HIGHBITDEPTH) {
     build_intra_predictors_high(
         xd, ref, ref_stride, dst, dst_stride, mode, angle_delta,

av1/decoder/decodeframe.c

diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index 2bd9d02..ac8f5c2 100644
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -2708,7 +2708,7 @@
   cm->show_frame = aom_rb_read_bit(rb);
   cm->intra_only = cm->frame_type == INTRA_ONLY_FRAME;
   cm->error_resilient_mode = aom_rb_read_bit(rb);
-  cm->disable_intra_edge_filter = 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

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 993e456..131429c 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -3045,7 +3045,7 @@
   aom_wb_write_bit(wb, cm->show_frame);
   aom_wb_write_bit(wb, cm->error_resilient_mode);
 
-  aom_wb_write_bit(wb, cm->disable_intra_edge_filter);
+  aom_wb_write_bit(wb, cm->enable_intra_edge_filter);
   aom_wb_write_bit(wb, cm->allow_filter_intra);
 
 #if CONFIG_CDF_UPDATE_MODE

av1/encoder/encoder.c

diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c
index 57921da..7d2af9e 100644
--- a/av1/encoder/encoder.c
+++ b/av1/encoder/encoder.c
@@ -2572,7 +2572,7 @@
 #if CONFIG_AMVR
   cm->seq_params.force_integer_mv = 2;
 #endif
-  cm->disable_intra_edge_filter = 0;
+  cm->enable_intra_edge_filter = 1;
   cm->allow_filter_intra = 1;
 
 #if CONFIG_EXPLICIT_ORDER_HINT