commit 1033ca0a1bd8594425d99e593f99247843d8c9d2
author Jingning Han <jingning@google.com> Fri Sep 29 07:58:48 2017 -0700
committer Jingning Han <jingning@google.com> Fri Sep 29 22:30:33 2017 +0000
tree 856ca201720d3b79564acedcb51070f597297ddb
parent 2609a61ba4d3f780a3d4dd9785aa592178739cbf

Add frame_marker experimental flag

The frame index in natural display order is needed by several
experiments, hence move it as a root experiment. The additional
overhead cost associated with frame_marker is below 0.05% level.

Change-Id: Ie643a6bc1f5a400ea6ff088751a676bb56ffee76

build/cmake/aom_config_defaults.cmake

diff --git a/build/cmake/aom_config_defaults.cmake b/build/cmake/aom_config_defaults.cmake
index 0333798..169ed1c 100644
--- a/build/cmake/aom_config_defaults.cmake
+++ b/build/cmake/aom_config_defaults.cmake
@@ -148,6 +148,7 @@
 set(CONFIG_FILTER_7BIT 1 CACHE NUMBER "AV1 experiment flag.")
 set(CONFIG_FILTER_INTRA 0 CACHE NUMBER "AV1 experiment flag.")
 set(CONFIG_FP_MB_STATS 0 CACHE NUMBER "AV1 experiment flag.")
+set(CONFIG_FRAME_MARKER 0 CACHE NUMBER "AV1 experiment flag.")
 set(CONFIG_FRAME_SIZE 0 CACHE NUMBER "AV1 experiment flag.")
 set(CONFIG_FRAME_SUPERRES 0 CACHE NUMBER "AV1 experiment flag.")
 set(CONFIG_GF_GROUPS 0 CACHE NUMBER "AV1 experiment flag.")

build/cmake/aom_configure.cmake

diff --git a/build/cmake/aom_configure.cmake b/build/cmake/aom_configure.cmake
index a67ff40..a327283 100644
--- a/build/cmake/aom_configure.cmake
+++ b/build/cmake/aom_configure.cmake
@@ -244,6 +244,18 @@
   endif ()
 endif ()
 
+if (CONFIG_MFMV)
+  if (NOT CONFIG_FRAME_MARKER)
+    change_config_and_warn(CONFIG_FRAME_MARKER 1 CONFIG_MFMV)
+  endif()
+endif()
+
+if (CONFIG_JNT_COMP)
+  if (NOT CONFIG_FRAME_MARKER)
+    change_config_and_warn(CONFIG_FRAME_MARKER 1 CONFIG_JNT_COMP)
+  endif()
+endif()
+
 if (CONFIG_AMVR)
   change_config_and_warn(CONFIG_HASH_ME 1 CONFIG_AMVR)
 endif ()

configure

diff --git a/configure b/configure
index 4351a55..d427a78 100755
--- a/configure
+++ b/configure
@@ -347,6 +347,7 @@
     hash_me
     colorspace_headers
     mfmv
+    frame_marker
     jnt_comp
     obu
     amvr
@@ -569,6 +570,8 @@
     enabled cfl && enable_feature smooth_hv
     enabled cdef_singlepass && enable_feature cdef
     enabled new_multisymbol && enable_feature restrict_compressed_hdr
+    enabled mfmv && enable_feature frame_marker
+    enabled jnt_comp && enable_feature frame_marker
 
     if enabled rawbits && enabled ans; then
       log_echo "rawbits requires not ans, so disabling rawbits"