Soft enable TMV
Soft enabled TMV to realize the decoder speedup.
Change-Id: Id8ca3e82b3cad968dc795badc40a53ef87376615
diff --git a/build/cmake/aom_config_defaults.cmake b/build/cmake/aom_config_defaults.cmake
index 6e15b13..e5f2475 100644
--- a/build/cmake/aom_config_defaults.cmake
+++ b/build/cmake/aom_config_defaults.cmake
@@ -189,7 +189,7 @@
set(CONFIG_SMOOTH_HV 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_STRIPED_LOOP_RESTORATION 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_TEMPMV_SIGNALING 1 CACHE NUMBER "AV1 experiment flag.")
-set(CONFIG_TMV 0 CACHE NUMBER "AV1 experiment flag.")
+set(CONFIG_TMV 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_TPL_MV 0 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_TX64X64 0 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_TXK_SEL 0 CACHE NUMBER "AV1 experiment flag.")
diff --git a/build/cmake/aom_configure.cmake b/build/cmake/aom_configure.cmake
index 890234b..96e39d7 100644
--- a/build/cmake/aom_configure.cmake
+++ b/build/cmake/aom_configure.cmake
@@ -56,8 +56,8 @@
unset(var_helpstring)
get_property(var_helpstring CACHE ${var} PROPERTY HELPSTRING)
if ("${var_helpstring}" STREQUAL "AV1 experiment flag.")
- if ("${var}" MATCHES "CONFIG_TXMG")
- # TXMG is required for configure compatibility.
+ if ("${var}" MATCHES "CONFIG_TMV\|CONFIG_TXMG")
+ # TXMG and TMV are required for configure compatibility.
else ()
set(${var} 0)
endif ()
diff --git a/configure b/configure
index 31a4fe2..bb6637d 100755
--- a/configure
+++ b/configure
@@ -532,6 +532,9 @@
# Enable LBD/HBD txfm consistency tool
soft_enable txmg
+ # Enable using 8x8 TMV to realize the decoder speedup.
+ soft_enable tmv
+
# Fix up experiment dependencies
enabled lv_map && disable_feature mrc_tx
enabled eob_first && enable_feature lv_map
