commit da69a20583653f538add4a7fdb60e644d1c7ccd1
author Thomas Daede <tdaede@mozilla.com> Fri Jan 05 13:22:04 2018 -0800
committer Thomas Daede <tdaede@mozilla.com> Sat Jan 06 00:47:59 2018 +0000
tree dfd64a333fca8c7588aa5deab2cb80a703e84c74
parent f5aff44df5eda3c89a46b54446ebca928b2fd13b

Remove ability to disable LV_MAP_PROB.

Change-Id: Ic832f1eb2f881f7f57944f4e472be0083f072288

aom_dsp/prob.h

diff --git a/aom_dsp/prob.h b/aom_dsp/prob.h
index 50d8ffd..0e4dfb5 100644
--- a/aom_dsp/prob.h
+++ b/aom_dsp/prob.h
@@ -101,8 +101,6 @@
 
 #define MAX_PROB 255
 
-#define LV_MAP_PROB 1
-
 #define BR_NODE 1
 
 #define aom_prob_half ((aom_prob)128)

av1/decoder/decodetxb.c

diff --git a/av1/decoder/decodetxb.c b/av1/decoder/decodetxb.c
index c9ded79..0c7dfe9 100644
--- a/av1/decoder/decodetxb.c
+++ b/av1/decoder/decodetxb.c
@@ -357,13 +357,8 @@
     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);

av1/encoder/encodetxb.c

diff --git a/av1/encoder/encodetxb.c b/av1/encoder/encodetxb.c
index e01c36b..bcc6d55 100644
--- a/av1/encoder/encodetxb.c
+++ b/av1/encoder/encodetxb.c
@@ -592,12 +592,8 @@
     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 @@
     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;
   }