Commit da69a205 authored by Thomas Daede's avatar Thomas Daede
Browse files

Remove ability to disable LV_MAP_PROB.

Change-Id: Ic832f1eb2f881f7f57944f4e472be0083f072288
parent f5aff44d
......@@ -101,8 +101,6 @@ typedef uint16_t aom_cdf_prob;
#define MAX_PROB 255
#define LV_MAP_PROB 1
#define BR_NODE 1
#define aom_prob_half ((aom_prob)128)
......
......@@ -357,13 +357,8 @@ uint8_t av1_read_coeffs_txb(const AV1_COMMON *const cm, MACROBLOCKD *const xd,
if (levels[get_padded_idx(pos, bwl)] == 0) continue;
if (c == 0) {
const int dc_sign_ctx = txb_ctx->dc_sign_ctx;
#if LV_MAP_PROB
*sign = av1_read_record_bin(
counts, r, ec_ctx->dc_sign_cdf[plane_type][dc_sign_ctx], 2, ACCT_STR);
// printf("dc_sign: %d %d\n", plane_type, dc_sign_ctx);
#else
*sign = aom_read(r, ec_ctx->dc_sign[plane_type][dc_sign_ctx], ACCT_STR);
#endif
if (counts) ++counts->dc_sign[plane_type][dc_sign_ctx][*sign];
} else {
*sign = av1_read_record_bit(counts, r, ACCT_STR);
......
......@@ -592,12 +592,8 @@ void av1_write_coeffs_txb(const AV1_COMMON *const cm, MACROBLOCKD *xd,
if (level == 0) continue;
if (c == 0) {
#if LV_MAP_PROB
aom_write_bin(w, sign,
ec_ctx->dc_sign_cdf[plane_type][txb_ctx->dc_sign_ctx], 2);
#else
aom_write(w, sign, ec_ctx->dc_sign[plane_type][txb_ctx->dc_sign_ctx]);
#endif
} else {
aom_write_bit(w, sign);
}
......@@ -2441,10 +2437,8 @@ void av1_update_and_record_txb_context(int plane, int block, int blk_row,
int dc_sign_ctx = txb_ctx.dc_sign_ctx;
++td->counts->dc_sign[plane_type][dc_sign_ctx][sign];
#if LV_MAP_PROB
if (allow_update_cdf)
update_bin(ec_ctx->dc_sign_cdf[plane_type][dc_sign_ctx], sign, 2);
#endif
x->mbmi_ext->dc_sign_ctx[plane][block] = dc_sign_ctx;
}
......
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