cosmetic changes in entropy context selection
using consistent function(get_lower_levels_ctx_eob) for encoder and
decoder; remove unreachable break; extract the same table lookup
outside the loop;
Change-Id: Id39a9268b900cb885ec3bebd61d40d7e9c8638e0
diff --git a/av1/common/txb_common.h b/av1/common/txb_common.h
index 533103d..5e5ead0 100644
--- a/av1/common/txb_common.h
+++ b/av1/common/txb_common.h
@@ -272,12 +272,10 @@
const int row = coeff_idx >> bwl;
const int col = coeff_idx - (row << bwl);
return ctx + nz_map_ctx_offset_1d[col];
- break;
}
case TX_CLASS_VERT: {
const int row = coeff_idx >> bwl;
return ctx + nz_map_ctx_offset_1d[row];
- break;
}
default: break;
}
diff --git a/av1/decoder/decodetxb.c b/av1/decoder/decodetxb.c
index ec73dd1..7e6f685 100644
--- a/av1/decoder/decodetxb.c
+++ b/av1/decoder/decodetxb.c
@@ -223,18 +223,19 @@
break;
}
- if (k_eob_offset_bits[eob_pt] > 0) {
+ const int eob_offset_bits = k_eob_offset_bits[eob_pt];
+ if (eob_offset_bits > 0) {
const int eob_ctx = eob_pt - 3;
int bit = aom_read_symbol(
r, ec_ctx->eob_extra_cdf[txs_ctx][plane_type][eob_ctx], 2, ACCT_STR);
if (bit) {
- eob_extra += (1 << (k_eob_offset_bits[eob_pt] - 1));
+ eob_extra += (1 << (eob_offset_bits - 1));
}
- for (int i = 1; i < k_eob_offset_bits[eob_pt]; i++) {
+ for (int i = 1; i < eob_offset_bits; i++) {
bit = aom_read_bit(r, ACCT_STR);
if (bit) {
- eob_extra += (1 << (k_eob_offset_bits[eob_pt] - 1 - i));
+ eob_extra += (1 << (eob_offset_bits - 1 - i));
}
}
}
@@ -252,11 +253,9 @@
int level = aom_read_symbol(r, cdf, nsymbs, ACCT_STR) + 1;
if (level > NUM_BASE_LEVELS) {
const int br_ctx = get_br_ctx(levels, pos, bwl, tx_class);
+ cdf = ec_ctx->coeff_br_cdf[AOMMIN(txs_ctx, TX_32X32)][plane_type][br_ctx];
for (int idx = 0; idx < COEFF_BASE_RANGE; idx += BR_CDF_SIZE - 1) {
- const int k = aom_read_symbol(
- r,
- ec_ctx->coeff_br_cdf[AOMMIN(txs_ctx, TX_32X32)][plane_type][br_ctx],
- BR_CDF_SIZE, ACCT_STR);
+ const int k = aom_read_symbol(r, cdf, BR_CDF_SIZE, ACCT_STR);
level += k;
if (k < BR_CDF_SIZE - 1) break;
}
diff --git a/av1/encoder/encodetxb.c b/av1/encoder/encodetxb.c
index 4c2f825..edd5f39 100644
--- a/av1/encoder/encodetxb.c
+++ b/av1/encoder/encodetxb.c
@@ -554,14 +554,15 @@
break;
}
- if (k_eob_offset_bits[eob_pt] > 0) {
+ const int eob_offset_bits = k_eob_offset_bits[eob_pt];
+ if (eob_offset_bits > 0) {
const int eob_ctx = eob_pt - 3;
- int eob_shift = k_eob_offset_bits[eob_pt] - 1;
+ int eob_shift = eob_offset_bits - 1;
int bit = (eob_extra & (1 << eob_shift)) ? 1 : 0;
aom_write_symbol(w, bit,
ec_ctx->eob_extra_cdf[txs_ctx][plane_type][eob_ctx], 2);
- for (int i = 1; i < k_eob_offset_bits[eob_pt]; i++) {
- eob_shift = k_eob_offset_bits[eob_pt] - 1 - i;
+ for (int i = 1; i < eob_offset_bits; i++) {
+ eob_shift = eob_offset_bits - 1 - i;
bit = (eob_extra & (1 << eob_shift)) ? 1 : 0;
aom_write_bit(w, bit);
}
@@ -588,12 +589,11 @@
// level is above 1.
const int base_range = level - 1 - NUM_BASE_LEVELS;
const int br_ctx = get_br_ctx(levels, pos, bwl, tx_class);
+ aom_cdf_prob *cdf =
+ ec_ctx->coeff_br_cdf[AOMMIN(txs_ctx, TX_32X32)][plane_type][br_ctx];
for (int idx = 0; idx < COEFF_BASE_RANGE; idx += BR_CDF_SIZE - 1) {
const int k = AOMMIN(base_range - idx, BR_CDF_SIZE - 1);
- aom_write_symbol(
- w, k,
- ec_ctx->coeff_br_cdf[AOMMIN(txs_ctx, TX_32X32)][plane_type][br_ctx],
- BR_CDF_SIZE);
+ aom_write_symbol(w, k, cdf, BR_CDF_SIZE);
if (k < BR_CDF_SIZE - 1) break;
}
}
@@ -1485,8 +1485,7 @@
levels[get_padded_idx(last_ci, bwl)] = 0;
}
- const int coeff_ctx_new_eob = get_lower_levels_ctx_general(
- 1, si, bwl, height, levels, ci, tx_size, tx_class);
+ const int coeff_ctx_new_eob = get_lower_levels_ctx_eob(bwl, height, si);
const int new_eob_cost =
get_eob_cost(new_eob, txb_eob_costs, txb_costs, tx_class);
int rate_coeff_eob =
@@ -1642,8 +1641,7 @@
--si;
} else {
assert(abs_qc == 1);
- const int coeff_ctx = get_lower_levels_ctx_general(
- 1, si, bwl, height, levels, ci, tx_size, tx_class);
+ const int coeff_ctx = get_lower_levels_ctx_eob(bwl, height, si);
accu_rate += get_coeff_cost_general(1, ci, abs_qc, sign, coeff_ctx,
txb_ctx->dc_sign_ctx, txb_costs, bwl,
tx_class, levels);
