Revert "Turn lv_map lv_map_multi on by default"
This reverts commit 2944f9d110cf2ac6da2bc9c0a61e2628b71ace6b.
Reason for revert: it breaks encode+decode with error message:
"Warning: Failed to decode frame 1: Bitstream not supported by this
decoder".
BUG=aomedia:1193
Change-Id: I43e0adae0f000982455ed4d838c0f8e841f77af0
diff --git a/av1/encoder/encodetxb.c b/av1/encoder/encodetxb.c
index cac7bda..86e4663 100644
--- a/av1/encoder/encodetxb.c
+++ b/av1/encoder/encodetxb.c
@@ -727,7 +727,6 @@
}
}
-#if !CONFIG_LV_MAP_MULTI
static INLINE int get_base_cost(tran_low_t abs_qc, int ctx,
const int coeff_base[2], int base_idx) {
const int level = base_idx + 1;
@@ -737,7 +736,6 @@
else
return coeff_base[abs_qc == level];
}
-#endif
// Note: don't call this function when eob is 0.
int av1_cost_coeffs_txb(const AV1_COMMON *const cm, const MACROBLOCK *x,
@@ -1437,7 +1435,6 @@
txb_info->seg_eob = av1_get_max_eob(txb_info->tx_size);
}
-#if !CONFIG_LV_MAP_MULTI
static INLINE int get_eob_ctx(const int coeff_idx, // raster order
const TX_SIZE txs_ctx) {
if (txs_ctx == TX_4X4) return av1_coeff_band_4x4[coeff_idx];
@@ -1455,6 +1452,7 @@
return 0;
}
+#if !CONFIG_LV_MAP_MULTI
// TODO(angiebird): add static to this function once it's called
int try_change_eob(int *new_eob, int coeff_idx, const TxbCache *txb_cache,
const LV_MAP_COEFF_COST *txb_costs, TxbInfo *txb_info,
diff --git a/build/cmake/aom_config_defaults.cmake b/build/cmake/aom_config_defaults.cmake
index 53be933..2332942 100644
--- a/build/cmake/aom_config_defaults.cmake
+++ b/build/cmake/aom_config_defaults.cmake
@@ -156,8 +156,8 @@
set(CONFIG_LOOPFILTERING_ACROSS_TILES_EXT 0 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_LOOPFILTER_LEVEL 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_LOOP_RESTORATION 1 CACHE NUMBER "AV1 experiment flag.")
-set(CONFIG_LV_MAP 1 CACHE NUMBER "AV1 experiment flag.")
-set(CONFIG_LV_MAP_MULTI 1 CACHE NUMBER "AV1 experiment flag.")
+set(CONFIG_LV_MAP 0 CACHE NUMBER "AV1 experiment flag.")
+set(CONFIG_LV_MAP_MULTI 0 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_MAX_TILE 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_MFMV 0 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_MONO_VIDEO 0 CACHE NUMBER "AV1 experiment flag.")
diff --git a/configure b/configure
index e6be0f5..7662f49 100755
--- a/configure
+++ b/configure
@@ -491,8 +491,6 @@
soft_enable loop_restoration
soft_enable ext_partition
soft_enable ext_partition_types
- soft_enable lv_map
- soft_enable lv_map_multi
# Provisional adopted
soft_enable reference_buffer
diff --git a/test/encodetxb_test.cc b/test/encodetxb_test.cc
index 6babe91..dfb2a63 100644
--- a/test/encodetxb_test.cc
+++ b/test/encodetxb_test.cc
@@ -23,6 +23,7 @@
#include "av1/common/onyxc_int.h"
#include "av1/common/scan.h"
#include "av1/common/txb_common.h"
+#include "av1/decoder/decodeframe.h"
#include "test/acm_random.h"
#include "test/clear_system_state.h"
#include "test/register_state_check.h"
