Fix lv-map tile independence unit test
BUG=aomedia:719
Change-Id: Id47c2c68cb61e142ce62fee5e97f7c474b3dc273
diff --git a/av1/encoder/encodetxb.c b/av1/encoder/encodetxb.c
index 2d09696..1012668 100644
--- a/av1/encoder/encodetxb.c
+++ b/av1/encoder/encodetxb.c
@@ -113,15 +113,16 @@
const int height = tx_size_high[tx_size];
const int seg_eob = tx_size_2d[tx_size];
uint16_t update_eob = 0;
+ FRAME_CONTEXT *ec_ctx = xd->tile_ctx;
(void)blk_row;
(void)blk_col;
#if LV_MAP_PROB
aom_write_symbol(w, eob == 0,
- cm->fc->txb_skip_cdf[txs_ctx][txb_ctx->txb_skip_ctx], 2);
+ ec_ctx->txb_skip_cdf[txs_ctx][txb_ctx->txb_skip_ctx], 2);
#else
- aom_write(w, eob == 0, cm->fc->txb_skip[txs_ctx][txb_ctx->txb_skip_ctx]);
+ aom_write(w, eob == 0, ec_ctx->txb_skip[txs_ctx][txb_ctx->txb_skip_ctx]);
#endif
if (eob == 0) return;
@@ -131,8 +132,8 @@
#endif
#if !LV_MAP_PROB
- nz_map = cm->fc->nz_map[txs_ctx][plane_type];
- eob_flag = cm->fc->eob_flag[txs_ctx][plane_type];
+ nz_map = ec_ctx->nz_map[txs_ctx][plane_type];
+ eob_flag = ec_ctx->eob_flag[txs_ctx][plane_type];
#endif
for (c = 0; c < eob; ++c) {
@@ -146,7 +147,7 @@
#if LV_MAP_PROB
aom_write_symbol(w, is_nz,
- cm->fc->nz_map_cdf[txs_ctx][plane_type][coeff_ctx], 2);
+ ec_ctx->nz_map_cdf[txs_ctx][plane_type][coeff_ctx], 2);
#else
aom_write(w, is_nz, nz_map[coeff_ctx]);
#endif
@@ -154,7 +155,7 @@
if (is_nz) {
#if LV_MAP_PROB
aom_write_symbol(w, c == (eob - 1),
- cm->fc->eob_flag_cdf[txs_ctx][plane_type][eob_ctx], 2);
+ ec_ctx->eob_flag_cdf[txs_ctx][plane_type][eob_ctx], 2);
#else
aom_write(w, c == (eob - 1), eob_flag[eob_ctx]);
#endif
@@ -164,7 +165,7 @@
int i;
for (i = 0; i < NUM_BASE_LEVELS; ++i) {
#if !LV_MAP_PROB
- aom_prob *coeff_base = cm->fc->coeff_base[txs_ctx][plane_type][i];
+ aom_prob *coeff_base = ec_ctx->coeff_base[txs_ctx][plane_type][i];
#endif
update_eob = 0;
for (c = eob - 1; c >= 0; --c) {
@@ -180,17 +181,17 @@
if (level == i + 1) {
#if LV_MAP_PROB
aom_write_symbol(
- w, 1, cm->fc->coeff_base_cdf[txs_ctx][plane_type][i][ctx], 2);
+ w, 1, ec_ctx->coeff_base_cdf[txs_ctx][plane_type][i][ctx], 2);
#else
aom_write(w, 1, coeff_base[ctx]);
#endif
if (c == 0) {
#if LV_MAP_PROB
aom_write_symbol(
- w, sign, cm->fc->dc_sign_cdf[plane_type][txb_ctx->dc_sign_ctx],
+ w, sign, ec_ctx->dc_sign_cdf[plane_type][txb_ctx->dc_sign_ctx],
2);
#else
- aom_write(w, sign, cm->fc->dc_sign[plane_type][txb_ctx->dc_sign_ctx]);
+ aom_write(w, sign, ec_ctx->dc_sign[plane_type][txb_ctx->dc_sign_ctx]);
#endif
} else {
aom_write_bit(w, sign);
@@ -200,7 +201,7 @@
#if LV_MAP_PROB
aom_write_symbol(w, 0,
- cm->fc->coeff_base_cdf[txs_ctx][plane_type][i][ctx], 2);
+ ec_ctx->coeff_base_cdf[txs_ctx][plane_type][i][ctx], 2);
#else
aom_write(w, 0, coeff_base[ctx]);
#endif
@@ -220,9 +221,9 @@
if (c == 0) {
#if LV_MAP_PROB
aom_write_symbol(
- w, sign, cm->fc->dc_sign_cdf[plane_type][txb_ctx->dc_sign_ctx], 2);
+ w, sign, ec_ctx->dc_sign_cdf[plane_type][txb_ctx->dc_sign_ctx], 2);
#else
- aom_write(w, sign, cm->fc->dc_sign[plane_type][txb_ctx->dc_sign_ctx]);
+ aom_write(w, sign, ec_ctx->dc_sign[plane_type][txb_ctx->dc_sign_ctx]);
#endif
} else {
aom_write_bit(w, sign);
@@ -233,18 +234,18 @@
for (idx = 0; idx < COEFF_BASE_RANGE; ++idx) {
if (level == (idx + 1 + NUM_BASE_LEVELS)) {
#if LV_MAP_PROB
- aom_write_symbol(w, 1, cm->fc->coeff_lps_cdf[txs_ctx][plane_type][ctx],
+ aom_write_symbol(w, 1, ec_ctx->coeff_lps_cdf[txs_ctx][plane_type][ctx],
2);
#else
- aom_write(w, 1, cm->fc->coeff_lps[txs_ctx][plane_type][ctx]);
+ aom_write(w, 1, ec_ctx->coeff_lps[txs_ctx][plane_type][ctx]);
#endif
break;
}
#if LV_MAP_PROB
- aom_write_symbol(w, 0, cm->fc->coeff_lps_cdf[txs_ctx][plane_type][ctx],
+ aom_write_symbol(w, 0, ec_ctx->coeff_lps_cdf[txs_ctx][plane_type][ctx],
2);
#else
- aom_write(w, 0, cm->fc->coeff_lps[txs_ctx][plane_type][ctx]);
+ aom_write(w, 0, ec_ctx->coeff_lps[txs_ctx][plane_type][ctx]);
#endif
}
if (idx < COEFF_BASE_RANGE) continue;
