Commit 2537bfc5 authored by Yaowu Xu's avatar Yaowu Xu Committed by Sebastien Alaiwan

Turn lv_map lv_map_multi on by default

Since 1193 is now fixed.

BUG=aomedia:1193

Change-Id: I79952e42679b68d8a1abc873b2c6f66711a7c4d8
parent 4a75b5a0
...@@ -762,6 +762,7 @@ static INLINE int get_br_cost(tran_low_t abs_qc, int ctx, ...@@ -762,6 +762,7 @@ static INLINE int get_br_cost(tran_low_t abs_qc, int ctx,
} }
} }
#if !CONFIG_LV_MAP_MULTI
static INLINE int get_base_cost(tran_low_t abs_qc, int ctx, static INLINE int get_base_cost(tran_low_t abs_qc, int ctx,
const int coeff_base[2], int base_idx) { const int coeff_base[2], int base_idx) {
const int level = base_idx + 1; const int level = base_idx + 1;
...@@ -771,6 +772,7 @@ static INLINE int get_base_cost(tran_low_t abs_qc, int ctx, ...@@ -771,6 +772,7 @@ static INLINE int get_base_cost(tran_low_t abs_qc, int ctx,
else else
return coeff_base[abs_qc == level]; return coeff_base[abs_qc == level];
} }
#endif
// Note: don't call this function when eob is 0. // Note: don't call this function when eob is 0.
int av1_cost_coeffs_txb(const AV1_COMMON *const cm, const MACROBLOCK *x, int av1_cost_coeffs_txb(const AV1_COMMON *const cm, const MACROBLOCK *x,
...@@ -1470,6 +1472,7 @@ static INLINE void set_eob(TxbInfo *txb_info, int eob) { ...@@ -1470,6 +1472,7 @@ static INLINE void set_eob(TxbInfo *txb_info, int eob) {
txb_info->seg_eob = av1_get_max_eob(txb_info->tx_size); 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 static INLINE int get_eob_ctx(const int coeff_idx, // raster order
const TX_SIZE txs_ctx) { const TX_SIZE txs_ctx) {
if (txs_ctx == TX_4X4) return av1_coeff_band_4x4[coeff_idx]; if (txs_ctx == TX_4X4) return av1_coeff_band_4x4[coeff_idx];
...@@ -1487,7 +1490,6 @@ static INLINE int get_eob_ctx(const int coeff_idx, // raster order ...@@ -1487,7 +1490,6 @@ static INLINE int get_eob_ctx(const int coeff_idx, // raster order
return 0; return 0;
} }
#if !CONFIG_LV_MAP_MULTI
// TODO(angiebird): add static to this function once it's called // 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, int try_change_eob(int *new_eob, int coeff_idx, const TxbCache *txb_cache,
const LV_MAP_COEFF_COST *txb_costs, TxbInfo *txb_info, const LV_MAP_COEFF_COST *txb_costs, TxbInfo *txb_info,
......
...@@ -156,8 +156,8 @@ set(CONFIG_LOOPFILTERING_ACROSS_TILES 1 CACHE NUMBER "AV1 experiment flag.") ...@@ -156,8 +156,8 @@ set(CONFIG_LOOPFILTERING_ACROSS_TILES 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_LOOPFILTERING_ACROSS_TILES_EXT 1 CACHE NUMBER "AV1 experiment flag.") set(CONFIG_LOOPFILTERING_ACROSS_TILES_EXT 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_LOOPFILTER_LEVEL 1 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_LOOP_RESTORATION 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_LV_MAP 0 CACHE NUMBER "AV1 experiment flag.") set(CONFIG_LV_MAP 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_LV_MAP_MULTI 0 CACHE NUMBER "AV1 experiment flag.") set(CONFIG_LV_MAP_MULTI 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_MAX_TILE 1 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_MFMV 0 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_MONO_VIDEO 0 CACHE NUMBER "AV1 experiment flag.") set(CONFIG_MONO_VIDEO 0 CACHE NUMBER "AV1 experiment flag.")
......
...@@ -488,6 +488,8 @@ post_process_cmdline() { ...@@ -488,6 +488,8 @@ post_process_cmdline() {
soft_enable loop_restoration soft_enable loop_restoration
soft_enable ext_partition soft_enable ext_partition
soft_enable ext_partition_types soft_enable ext_partition_types
soft_enable lv_map
soft_enable lv_map_multi
# Provisional adopted # Provisional adopted
soft_enable reference_buffer soft_enable reference_buffer
......
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
#include "av1/common/onyxc_int.h" #include "av1/common/onyxc_int.h"
#include "av1/common/scan.h" #include "av1/common/scan.h"
#include "av1/common/txb_common.h" #include "av1/common/txb_common.h"
#include "av1/decoder/decodeframe.h"
#include "test/acm_random.h" #include "test/acm_random.h"
#include "test/clear_system_state.h" #include "test/clear_system_state.h"
#include "test/register_state_check.h" #include "test/register_state_check.h"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment