commit d1b9dcf146c3014fdbd8192efa1a4a399b5cabf2
author Wan-Teh Chang <wtc@google.com> Wed Jun 06 10:45:18 2018 -0700
committer Wan-Teh Chang <wtc@google.com> Wed Jun 06 19:04:07 2018 +0000
tree 1fb13db80c384bfd04985b0be7db0d3241573c5b
parent 6f6091d73360010d84922421fae649259e816697

Rename preskip_segid to segid_preskip.

The corresponding variable in the spec is named SegIdPreSkip.

Change-Id: Ibd1b3ccd14e57c63102676c26dae66b9d8c4a4e2

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 7375616..f6ac616 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -907,9 +907,9 @@
 
   if (seg->update_map) {
     if (preskip) {
-      if (!seg->preskip_segid) return;
+      if (!seg->segid_preskip) return;
     } else {
-      if (seg->preskip_segid) return;
+      if (seg->segid_preskip) return;
       if (skip) {
         write_segment_id(cpi, mbmi, w, seg, segp, mi_row, mi_col, 1);
         if (seg->temporal_update) ((MB_MODE_INFO *)mbmi)->seg_id_predicted = 0;
@@ -1180,12 +1180,12 @@
   const BLOCK_SIZE bsize = mbmi->sb_type;
   const PREDICTION_MODE mode = mbmi->mode;
 
-  if (seg->preskip_segid && seg->update_map)
+  if (seg->segid_preskip && seg->update_map)
     write_segment_id(cpi, mbmi, w, seg, segp, mi_row, mi_col, 0);
 
   const int skip = write_skip(cm, xd, mbmi->segment_id, mbmi, w);
 
-  if (!seg->preskip_segid && seg->update_map)
+  if (!seg->segid_preskip && seg->update_map)
     write_segment_id(cpi, mbmi, w, seg, segp, mi_row, mi_col, skip);
 
   write_cdef(cm, xd, w, skip, mi_col, mi_row);