Commit 3b48a6d4 authored by Rupert Swarbrick's avatar Rupert Swarbrick Committed by Debargha Mukherjee

Remove nested #if !CONFIG_NEW_MULTISYMBOL lines

No change to the code, but these #if !CONFIG_NEW_MULTISYMBOL lines are
all in the #else part of an #if CONFIG_NEW_MULTISYMBOL...

Change-Id: Ibf11b1f0711113d9ee52927dcaf243d74e3f9d28
parent 7a7fffef
......@@ -3359,11 +3359,7 @@ static int read_compressed_header(AV1Decoder *pbi, const uint8_t *data,
#else
AV1_COMMON *const cm = &pbi->common;
aom_reader r;
#if ((CONFIG_RECT_TX_EXT) || (!CONFIG_NEW_MULTISYMBOL || CONFIG_LV_MAP) || \
(CONFIG_COMPOUND_SINGLEREF))
FRAME_CONTEXT *const fc = cm->fc;
#endif
#if CONFIG_ANS && ANS_MAX_SYMBOLS
r.window_size = 1 << cm->ans_window_size_log2;
......@@ -3378,7 +3374,6 @@ static int read_compressed_header(AV1Decoder *pbi, const uint8_t *data,
av1_diff_update_prob(&r, &fc->quarter_tx_size_prob, ACCT_STR);
#endif
#if !CONFIG_NEW_MULTISYMBOL
if (cm->tx_mode == TX_MODE_SELECT)
for (int i = 0; i < TXFM_PARTITION_CONTEXTS; ++i)
av1_diff_update_prob(&r, &fc->txfm_partition_prob[i], ACCT_STR);
......@@ -3389,23 +3384,17 @@ static int read_compressed_header(AV1Decoder *pbi, const uint8_t *data,
for (int i = 0; i < COMP_INDEX_CONTEXTS; ++i)
av1_diff_update_prob(&r, &fc->compound_index_probs[i], ACCT_STR);
#endif // CONFIG_JNT_COMP
#endif
if (!frame_is_intra_only(cm)) {
#if !CONFIG_NEW_MULTISYMBOL
read_inter_mode_probs(fc, &r);
#endif
if (cm->reference_mode != COMPOUND_REFERENCE &&
cm->allow_interintra_compound) {
#if !CONFIG_NEW_MULTISYMBOL
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);
}
}
#endif
#if !CONFIG_NEW_MULTISYMBOL
#if CONFIG_EXT_PARTITION_TYPES
int block_sizes_to_update = BLOCK_SIZES_ALL;
#else
......@@ -3416,24 +3405,18 @@ static int read_compressed_header(AV1Decoder *pbi, const uint8_t *data,
av1_diff_update_prob(&r, &fc->wedge_interintra_prob[i], ACCT_STR);
}
}
#endif // !CONFIG_NEW_MULTISYMBOL
}
#if !CONFIG_NEW_MULTISYMBOL
for (int i = 0; i < INTRA_INTER_CONTEXTS; i++)
av1_diff_update_prob(&r, &fc->intra_inter_prob[i], ACCT_STR);
#endif
#if !CONFIG_NEW_MULTISYMBOL
read_frame_reference_mode_probs(cm, &r);
#endif
#if CONFIG_COMPOUND_SINGLEREF
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
#if !CONFIG_NEW_MULTISYMBOL
#if CONFIG_AMVR
if (cm->cur_frame_force_integer_mv == 0) {
#endif
......@@ -3441,7 +3424,6 @@ static int read_compressed_header(AV1Decoder *pbi, const uint8_t *data,
read_mv_probs(&fc->nmvc[i], cm->allow_high_precision_mv, &r);
#if CONFIG_AMVR
}
#endif
#endif
}
......
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