Commit eb649729 authored by Thomas Davies's avatar Thomas Davies
Browse files

Enable new_tokenset by default and fix experiment compatibility.

Change-Id: Ifd55343b701eb753537b9711abd377adcedde8ec
parent 1d4568c0
...@@ -5481,7 +5481,7 @@ static void av1_default_coef_cdfs(FRAME_CONTEXT *fc) { ...@@ -5481,7 +5481,7 @@ static void av1_default_coef_cdfs(FRAME_CONTEXT *fc) {
default_coef_head_cdf_32x32[i][j][k][l]); default_coef_head_cdf_32x32[i][j][k][l]);
#if CONFIG_TX64X64 #if CONFIG_TX64X64
av1_copy(fc->coef_head_cdfs[TX_64X64][i][j][k][l], av1_copy(fc->coef_head_cdfs[TX_64X64][i][j][k][l],
default_coef_head_cdf_64x64[i][j][k][l]); default_coef_head_cdf_32x32[i][j][k][l]);
#endif #endif
} }
} }
......
...@@ -855,7 +855,7 @@ static INLINE void write_coeff_extra(const aom_prob *pb, int value, ...@@ -855,7 +855,7 @@ static INLINE void write_coeff_extra(const aom_prob *pb, int value,
} }
#endif #endif
#if CONFIG_NEW_TOKENSET #if CONFIG_NEW_TOKENSET && !CONFIG_LV_MAP
static void pack_mb_tokens(aom_writer *w, const TOKENEXTRA **tp, static void pack_mb_tokens(aom_writer *w, const TOKENEXTRA **tp,
const TOKENEXTRA *const stop, const TOKENEXTRA *const stop,
aom_bit_depth_t bit_depth, const TX_SIZE tx_size, aom_bit_depth_t bit_depth, const TX_SIZE tx_size,
......
...@@ -478,6 +478,7 @@ post_process_cmdline() { ...@@ -478,6 +478,7 @@ post_process_cmdline() {
soft_enable rect_tx soft_enable rect_tx
soft_enable cdef soft_enable cdef
soft_enable ec_adapt soft_enable ec_adapt
soft_enable new_tokenset
# Enable low-bitdepth pixel pipeline by default # Enable low-bitdepth pixel pipeline by default
soft_enable lowbitdepth soft_enable lowbitdepth
......
...@@ -50,7 +50,7 @@ decode_to_md5() { ...@@ -50,7 +50,7 @@ decode_to_md5() {
decode_to_md5_av1() { decode_to_md5_av1() {
# expected MD5 sum for the last frame. # expected MD5 sum for the last frame.
local expected_md5="2da13fe8dcd86d86b4bd8d4147f3dce6" local expected_md5="26d3ef1d60754a1f6acb603c3763efbe"
local file="${AV1_IVF_FILE}" local file="${AV1_IVF_FILE}"
if [ "$(av1_decode_available)" = "yes" ]; then if [ "$(av1_decode_available)" = "yes" ]; then
......
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