commit ea255c9ba5fc9bba6792123938f76163e461a0b6
author Jingning Han <jingning@google.com> Fri Sep 29 08:12:09 2017 -0700
committer Jingning Han <jingning@google.com> Fri Sep 29 22:30:33 2017 +0000
tree 85ee6b57d3ddfb76d7122c06225c6de2b5299c39
parent 1033ca0a1bd8594425d99e593f99247843d8c9d2

Make frame marker a root experiment

Move functions related to frame index in natural order setup into
a root experiment.

Change-Id: Iebc71514b951dbb658cf0e1c3d42bb2b180d830f

av1/common/mvref_common.c

diff --git a/av1/common/mvref_common.c b/av1/common/mvref_common.c
index 954f13f..9d7a113 100644
--- a/av1/common/mvref_common.c
+++ b/av1/common/mvref_common.c
@@ -1296,7 +1296,7 @@
   }
 }
 
-#if CONFIG_MFMV
+#if CONFIG_FRAME_MARKER
 void av1_setup_frame_buf_refs(AV1_COMMON *cm) {
   cm->cur_frame->cur_frame_offset = cm->frame_offset;
   int alt_buf_idx = cm->frame_refs[ALTREF_FRAME - LAST_FRAME].idx;
@@ -1340,7 +1340,9 @@
         cm->buffer_pool->frame_bufs[alt2_buf_idx].cur_frame_offset;
 #endif
 }
+#endif  // CONFIG_FRAME_MARKER
 
+#if CONFIG_MFMV
 // Although we assign 32 bit integers, all the values are strictly under 14
 // bits.
 static int div_mult[32] = {