Merge "Enable tile-adaptive restoration" into nextgenv2

diff --cc av1/common/entropymode.c
index 62bf0a4c4533cd6a9c9d736537dedcb12cd1041f,856fa356150ae1084fb517f14d34d3b93258fba6..61a2c315f6b1ccea015d38105b158d18986644c8
--- 1/av1/common/entropymode.c
--- 2/av1/common/entropymode.c
+++ b/av1/common/entropymode.c
@@@ -846,25 -838,36 +846,36 @@@ const aom_tree_index av1_tx_size_tree[T
    },
  };
  
 -static const aom_prob
 -    default_tx_size_prob[TX_SIZES - 1][TX_SIZE_CONTEXTS][TX_SIZES - 1] = {
 -      {
 -          // Max tx_size is 8X8
 -          { 100 },
 -          { 66 },
 -      },
 -      {
 -          // Max tx_size is 16X16
 -          { 20, 152 },
 -          { 15, 101 },
 -      },
 -      {
 -          // Max tx_size is 32X32
 -          { 3, 136, 37 },
 -          { 5, 52, 13 },
 -      },
 -    };
 +static const aom_prob default_tx_size_prob[TX_SIZES - 1][TX_SIZE_CONTEXTS]
 +                                          [TX_SIZES - 1] = {
 +                                            {
 +                                                // Max tx_size is 8X8
 +                                                { 100 },
 +                                                { 66 },
 +                                            },
 +                                            {
 +                                                // Max tx_size is 16X16
 +                                                { 20, 152 },
 +                                                { 15, 101 },
 +                                            },
 +                                            {
 +                                                // Max tx_size is 32X32
 +                                                { 3, 136, 37 },
 +                                                { 5, 52, 13 },
 +                                            },
 +                                          };
  
+ #if CONFIG_LOOP_RESTORATION
+ const aom_tree_index
+     av1_switchable_restore_tree[TREE_SIZE(RESTORE_SWITCHABLE_TYPES)] = {
+       -RESTORE_NONE, 2,
+       -RESTORE_BILATERAL, -RESTORE_WIENER,
+     };
+ 
+ static const aom_prob
+     default_switchable_restore_prob[RESTORE_SWITCHABLE_TYPES - 1] = {32, 128};
+ #endif  // CONFIG_LOOP_RESTORATION
+ 
  #if CONFIG_EXT_TX && CONFIG_RECT_TX && CONFIG_VAR_TX
  // the probability of (0) using recursive square tx partition vs.
  // (1) biggest rect tx for 4X8-8X4/8X16-16X8/16X32-32X16 blocks

diff --cc av1/common/entropymode.h
Simple merge

diff --cc av1/common/restoration.c
Simple merge

diff --cc av1/decoder/decodeframe.c
Simple merge

diff --cc av1/encoder/bitstream.c
Simple merge

diff --cc av1/encoder/encoder.h
Simple merge