soft enable new_multisymbol
enable new_multisymbol by default since it has been enabled.
Change-Id: I6df662c6ae949ac9f834f788ff93b12a1a1eff28
diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index 8933b60..1855991 100644
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -5230,7 +5230,7 @@
return sz;
}
-#if CONFIG_SUPERTX
+#if CONFIG_SUPERTX && !CONFIG_RESTRICT_COMPRESSED_HDR
static void read_supertx_probs(FRAME_CONTEXT *fc, aom_reader *r) {
int i, j;
if (aom_read(r, GROUP_DIFF_UPDATE_PROB, ACCT_STR)) {
@@ -5256,9 +5256,11 @@
MACROBLOCKD *const xd = &pbi->mb;
#endif
aom_reader r;
-#if !CONFIG_NEW_MULTISYMBOL
+
+#if ((CONFIG_RECT_TX_EXT && (CONFIG_EXT_TX || CONFIG_VAR_TX)) || \
+ (!CONFIG_NEW_MULTISYMBOL || CONFIG_LV_MAP) || \
+ (CONFIG_COMPOUND_SINGLEREF || CONFIG_SUPERTX))
FRAME_CONTEXT *const fc = cm->fc;
- int i;
#endif
#if CONFIG_ANS && ANS_MAX_SYMBOLS
@@ -5281,10 +5283,10 @@
#if !CONFIG_NEW_MULTISYMBOL
#if CONFIG_VAR_TX
if (cm->tx_mode == TX_MODE_SELECT)
- for (i = 0; i < TXFM_PARTITION_CONTEXTS; ++i)
+ for (int i = 0; i < TXFM_PARTITION_CONTEXTS; ++i)
av1_diff_update_prob(&r, &fc->txfm_partition_prob[i], ACCT_STR);
#endif // CONFIG_VAR_TX
- for (i = 0; i < SKIP_CONTEXTS; ++i)
+ for (int i = 0; i < SKIP_CONTEXTS; ++i)
av1_diff_update_prob(&r, &fc->skip_probs[i], ACCT_STR);
#endif
@@ -5297,7 +5299,7 @@
if (cm->reference_mode != COMPOUND_REFERENCE &&
cm->allow_interintra_compound) {
#if !CONFIG_NEW_MULTISYMBOL
- for (i = 0; i < BLOCK_SIZE_GROUPS; i++) {
+ for (int i = 0; i < BLOCK_SIZE_GROUPS; i++) {
if (is_interintra_allowed_bsize_group(i)) {
av1_diff_update_prob(&r, &fc->interintra_prob[i], ACCT_STR);
}
@@ -5309,7 +5311,7 @@
#else
int block_sizes_to_update = BLOCK_SIZES;
#endif
- for (i = 0; i < block_sizes_to_update; i++) {
+ for (int i = 0; i < block_sizes_to_update; i++) {
if (is_interintra_allowed_bsize(i) && is_interintra_wedge_used(i)) {
av1_diff_update_prob(&r, &fc->wedge_interintra_prob[i], ACCT_STR);
}
@@ -5319,7 +5321,7 @@
#endif // CONFIG_INTERINTRA
#if !CONFIG_NEW_MULTISYMBOL
- for (i = 0; i < INTRA_INTER_CONTEXTS; i++)
+ for (int i = 0; i < INTRA_INTER_CONTEXTS; i++)
av1_diff_update_prob(&r, &fc->intra_inter_prob[i], ACCT_STR);
#endif
@@ -5328,7 +5330,7 @@
#endif
#if CONFIG_COMPOUND_SINGLEREF
- for (i = 0; i < COMP_INTER_MODE_CONTEXTS; i++)
+ for (int i = 0; i < COMP_INTER_MODE_CONTEXTS; i++)
av1_diff_update_prob(&r, &fc->comp_inter_mode_prob[i], ACCT_STR);
#endif // CONFIG_COMPOUND_SINGLEREF
@@ -5336,7 +5338,7 @@
#if CONFIG_AMVR
if (cm->cur_frame_mv_precision_level == 0) {
#endif
- for (i = 0; i < NMV_CONTEXTS; ++i)
+ for (int i = 0; i < NMV_CONTEXTS; ++i)
read_mv_probs(&fc->nmvc[i], cm->allow_high_precision_mv, &r);
#if CONFIG_AMVR
}
diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index ecc8072..3edf13a 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -5198,15 +5198,13 @@
#endif // CONFIG_SUPERTX
FRAME_CONTEXT *const fc = cm->fc;
aom_writer *header_bc;
- int i;
-#if !CONFIG_NEW_MULTISYMBOL
+
+#if !CONFIG_NEW_MULTISYMBOL || CONFIG_COMPOUND_SINGLEREF
FRAME_COUNTS *counts = cpi->td.counts;
- int j;
#endif
const int probwt = cm->num_tg;
(void)probwt;
- (void)i;
(void)fc;
aom_writer real_header_bc;
@@ -5242,7 +5240,7 @@
if (cm->reference_mode != COMPOUND_REFERENCE &&
cm->allow_interintra_compound) {
#if !CONFIG_NEW_MULTISYMBOL
- for (i = 0; i < BLOCK_SIZE_GROUPS; i++) {
+ for (int i = 0; i < BLOCK_SIZE_GROUPS; i++) {
if (is_interintra_allowed_bsize_group(i)) {
av1_cond_prob_diff_update(header_bc, &fc->interintra_prob[i],
cm->counts.interintra[i], probwt);
@@ -5255,7 +5253,7 @@
#else
int block_sizes_to_update = BLOCK_SIZES;
#endif
- for (i = 0; i < block_sizes_to_update; i++) {
+ for (int i = 0; i < block_sizes_to_update; i++) {
if (is_interintra_allowed_bsize(i) && is_interintra_wedge_used(i))
av1_cond_prob_diff_update(header_bc, &fc->wedge_interintra_prob[i],
cm->counts.wedge_interintra[i], probwt);
@@ -5265,7 +5263,7 @@
#endif // CONFIG_INTERINTRA
#if !CONFIG_NEW_MULTISYMBOL
- for (i = 0; i < INTRA_INTER_CONTEXTS; i++)
+ for (int i = 0; i < INTRA_INTER_CONTEXTS; i++)
av1_cond_prob_diff_update(header_bc, &fc->intra_inter_prob[i],
counts->intra_inter[i], probwt);
#endif
@@ -5274,14 +5272,14 @@
if (cpi->allow_comp_inter_inter) {
const int use_hybrid_pred = cm->reference_mode == REFERENCE_MODE_SELECT;
if (use_hybrid_pred)
- for (i = 0; i < COMP_INTER_CONTEXTS; i++)
+ for (int i = 0; i < COMP_INTER_CONTEXTS; i++)
av1_cond_prob_diff_update(header_bc, &fc->comp_inter_prob[i],
counts->comp_inter[i], probwt);
}
if (cm->reference_mode != COMPOUND_REFERENCE) {
- for (i = 0; i < REF_CONTEXTS; i++) {
- for (j = 0; j < (SINGLE_REFS - 1); j++) {
+ for (int i = 0; i < REF_CONTEXTS; i++) {
+ for (int j = 0; j < (SINGLE_REFS - 1); j++) {
av1_cond_prob_diff_update(header_bc, &fc->single_ref_prob[i][j],
counts->single_ref[i][j], probwt);
}
@@ -5290,28 +5288,28 @@
if (cm->reference_mode != SINGLE_REFERENCE) {
#if CONFIG_EXT_COMP_REFS
- for (i = 0; i < COMP_REF_TYPE_CONTEXTS; i++)
+ for (int i = 0; i < COMP_REF_TYPE_CONTEXTS; i++)
av1_cond_prob_diff_update(header_bc, &fc->comp_ref_type_prob[i],
counts->comp_ref_type[i], probwt);
- for (i = 0; i < UNI_COMP_REF_CONTEXTS; i++)
- for (j = 0; j < (UNIDIR_COMP_REFS - 1); j++)
+ for (int i = 0; i < UNI_COMP_REF_CONTEXTS; i++)
+ for (int j = 0; j < (UNIDIR_COMP_REFS - 1); j++)
av1_cond_prob_diff_update(header_bc, &fc->uni_comp_ref_prob[i][j],
counts->uni_comp_ref[i][j], probwt);
#endif // CONFIG_EXT_COMP_REFS
- for (i = 0; i < REF_CONTEXTS; i++) {
+ for (int i = 0; i < REF_CONTEXTS; i++) {
#if CONFIG_EXT_REFS
- for (j = 0; j < (FWD_REFS - 1); j++) {
+ for (int j = 0; j < (FWD_REFS - 1); j++) {
av1_cond_prob_diff_update(header_bc, &fc->comp_ref_prob[i][j],
counts->comp_ref[i][j], probwt);
}
- for (j = 0; j < (BWD_REFS - 1); j++) {
+ for (int j = 0; j < (BWD_REFS - 1); j++) {
av1_cond_prob_diff_update(header_bc, &fc->comp_bwdref_prob[i][j],
counts->comp_bwdref[i][j], probwt);
}
#else
- for (j = 0; j < (COMP_REFS - 1); j++) {
+ for (int j = 0; j < (COMP_REFS - 1); j++) {
av1_cond_prob_diff_update(header_bc, &fc->comp_ref_prob[i][j],
counts->comp_ref[i][j], probwt);
}
@@ -5321,7 +5319,7 @@
#endif // CONFIG_NEW_MULTISYMBOL
#if CONFIG_COMPOUND_SINGLEREF
- for (i = 0; i < COMP_INTER_MODE_CONTEXTS; i++)
+ for (int i = 0; i < COMP_INTER_MODE_CONTEXTS; i++)
av1_cond_prob_diff_update(header_bc, &fc->comp_inter_mode_prob[i],
counts->comp_inter_mode[i], probwt);
#endif // CONFIG_COMPOUND_SINGLEREF
diff --git a/build/cmake/aom_config_defaults.cmake b/build/cmake/aom_config_defaults.cmake
index 488401b..7b44160 100644
--- a/build/cmake/aom_config_defaults.cmake
+++ b/build/cmake/aom_config_defaults.cmake
@@ -177,7 +177,7 @@
set(CONFIG_MV_COMPRESS 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_NCOBMC 0 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_NCOBMC_ADAPT_WEIGHT 0 CACHE NUMBER "AV1 experiment flag.")
-set(CONFIG_NEW_MULTISYMBOL 0 CACHE NUMBER "AV1 experiment flag.")
+set(CONFIG_NEW_MULTISYMBOL 1 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_NEW_QUANT 0 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_NO_FRAME_CONTEXT_SIGNALING 0 CACHE NUMBER "AV1 experiment flag.")
set(CONFIG_OBU 0 CACHE NUMBER "AV1 experiment flag.")
diff --git a/configure b/configure
index 50a5fb2..6cdc807 100755
--- a/configure
+++ b/configure
@@ -550,6 +550,7 @@
# Enable LBD/HBD txfm consistency tool
soft_enable txmg
+ soft_enable new_multisymbol
# Fix up experiment dependencies
enabled pvq && disable_feature chroma_2x2
