commit 36773c7a627b6b03d84157d98b5495b9f39502b6
author Jingning Han <jingning@google.com> Wed Oct 25 16:41:49 2017 -0700
committer Jingning Han <jingning@google.com> Thu Oct 26 19:14:09 2017 +0000
tree 71828737fe5e92fc3d39b6a8ac74237d4ba834cf
parent 00803a776e8d3fbc0815a8cddf84df0aab2d3965

Clean up br-node in lv-map

Use br-node approach, which can be easily turned into multi-symbol
if desired.

Change-Id: I40df5178ab299af24d347d91f01a88dbfc9305a6

av1/common/entropymode.c

diff --git a/av1/common/entropymode.c b/av1/common/entropymode.c
index cfada82..52857af 100644
--- a/av1/common/entropymode.c
+++ b/av1/common/entropymode.c
@@ -488,7 +488,7 @@
       172, 184, 192, 176, 201, 183, 177, 190, 128, 192, 199, 144,
       192, 192, 1,   196, 192, 255, 171, 178, 255, 128, 171, 179 } }
 };
-#if BR_NODE
+
 const aom_prob
     default_coeff_br[TX_SIZES][PLANE_TYPES][BASE_RANGE_SETS][LEVEL_CONTEXTS] = {
       { { { 62,  128, 54,  116, 128, 51,  97,  128, 59,  68,  107, 128,
@@ -588,7 +588,6 @@
             26,  27,  128, 126, 128, 255, 63, 142, 128, 128, 1,   1,
             125, 159, 128, 173, 212, 128, 85, 189, 128, 128, 255, 171 } } }
     };
-#endif  // BR_NODE
 #if CONFIG_CTX1D
 static const aom_prob default_eob_mode[TX_SIZES][PLANE_TYPES][TX_CLASSES] = {
   { { 128, 176, 157 }, { 128, 222, 198 } },
@@ -6343,9 +6342,7 @@
   av1_copy(fc->dc_sign, default_dc_sign);
   av1_copy(fc->coeff_base, default_coeff_base);
   av1_copy(fc->coeff_lps, default_coeff_lps);
-#if BR_NODE
   av1_copy(fc->coeff_br, default_coeff_br);
-#endif
 #if CONFIG_CTX1D
   av1_copy(fc->eob_mode, default_eob_mode);
   av1_copy(fc->empty_line, default_empty_line);