commit ca0cd3fb5a828d3c1da59fb28a710e024da1e039
author Zoe Liu <zoeliu@google.com> Mon Feb 26 15:07:50 2018 -0800
committer Zoe Liu <zoeliu@google.com> Tue Feb 27 01:04:26 2018 +0000
tree 619db1ca5d5e02d49ae2bb8d567bc8e09c19226a
parent 2382b1489ef8cbfe8bcfa2410ff634f7d4ba4e33

Remove CONFIG_REFERENCE_BUFFER flag

Now SequenceHeader is no need of a flag to access.

Change-Id: I3c76249f9b21d391bf4733ea4cf16f11da6c9c18

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 293722b..b2a816b 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -3170,7 +3170,6 @@
     aom_wb_write_bit(wb, 1);  // show_existing_frame
     aom_wb_write_literal(wb, cpi->existing_fb_idx_to_show, 3);
 
-#if CONFIG_REFERENCE_BUFFER
     if (cm->seq_params.frame_id_numbers_present_flag) {
       int frame_id_len = cm->seq_params.frame_id_length;
       int display_frame_id = cm->ref_frame_id[cpi->existing_fb_idx_to_show];
@@ -3180,7 +3179,6 @@
       /* Consider to have this logic only one place */
       aom_wb_write_literal(wb, 0, 8);
     }
-#endif  // CONFIG_REFERENCE_BUFFER
 
 #if CONFIG_FILM_GRAIN
     if (cm->film_grain_params_present && cm->show_frame) {
@@ -3244,13 +3242,11 @@
   }
 #endif  // CONFIG_AMVR
 
-#if CONFIG_REFERENCE_BUFFER
   cm->invalid_delta_frame_id_minus1 = 0;
   if (cm->seq_params.frame_id_numbers_present_flag) {
     int frame_id_len = cm->seq_params.frame_id_length;
     aom_wb_write_literal(wb, cm->current_frame_id, frame_id_len);
   }
-#endif  // CONFIG_REFERENCE_BUFFER
 
 #if CONFIG_FRAME_SIZE
   if (cm->width > cm->seq_params.max_frame_width ||
@@ -3375,7 +3371,7 @@
       if (cm->frame_type == S_FRAME) {
         assert(cm->ref_frame_sign_bias[ref_frame] == 0);
       }
-#if CONFIG_REFERENCE_BUFFER
+
       if (cm->seq_params.frame_id_numbers_present_flag) {
         int i = get_ref_frame_map_idx(cpi, ref_frame);
         int frame_id_len = cm->seq_params.frame_id_length;
@@ -3390,7 +3386,6 @@
           cm->invalid_delta_frame_id_minus1 = 1;
         aom_wb_write_literal(wb, delta_frame_id_minus1, diff_len);
       }
-#endif  // CONFIG_REFERENCE_BUFFER
     }
 
 #if CONFIG_FRAME_SIZE
@@ -3431,12 +3426,10 @@
     aom_wb_write_literal(wb, arf_offset, FRAME_OFFSET_BITS);
   }
 
-#if CONFIG_REFERENCE_BUFFER
   if (cm->seq_params.frame_id_numbers_present_flag) {
     cm->refresh_mask =
         cm->frame_type == KEY_FRAME ? 0xFF : get_refresh_mask(cpi);
   }
-#endif  // CONFIG_REFERENCE_BUFFER
 
 #if CONFIG_EXT_TILE
   const int might_bwd_adapt =