diff options
| author | James Zern <jzern@google.com> | 2015-06-15 23:02:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-06-15 23:02:42 +0000 |
| commit | 17c9678a3c78dd2b4046718effac96526b0c98e9 (patch) | |
| tree | d3c262d05b92a3b0b0c5d0d20527b2d414ccc3c0 /vp9/common | |
| parent | e8d3491ec25b28e5a1a0d6c771109441f460e37a (diff) | |
| parent | ef75416ab76b5de995ec8b7f71981644ebb987b3 (diff) | |
| download | libvpx-17c9678a3c78dd2b4046718effac96526b0c98e9.tar libvpx-17c9678a3c78dd2b4046718effac96526b0c98e9.tar.gz libvpx-17c9678a3c78dd2b4046718effac96526b0c98e9.tar.bz2 libvpx-17c9678a3c78dd2b4046718effac96526b0c98e9.zip | |
Merge "vp9_entropy: delete vp9_coefmodel_tree[]"
Diffstat (limited to 'vp9/common')
| -rw-r--r-- | vp9/common/vp9_entropy.c | 6 | ||||
| -rw-r--r-- | vp9/common/vp9_entropy.h | 1 |
2 files changed, 0 insertions, 7 deletions
diff --git a/vp9/common/vp9_entropy.c b/vp9/common/vp9_entropy.c index a2584e8da..ad6c04bcc 100644 --- a/vp9/common/vp9_entropy.c +++ b/vp9/common/vp9_entropy.c @@ -133,12 +133,6 @@ const uint8_t vp9_pt_energy_class[ENTROPY_TOKENS] = { 0, 1, 2, 3, 3, 4, 4, 5, 5, 5, 5, 5 }; -const vp9_tree_index vp9_coefmodel_tree[TREE_SIZE(UNCONSTRAINED_NODES + 1)] = { - -EOB_MODEL_TOKEN, 2, - -ZERO_TOKEN, 4, - -ONE_TOKEN, -TWO_TOKEN, -}; - // Model obtained from a 2-sided zero-centerd distribuition derived // from a Pareto distribution. The cdf of the distribution is: // cdf(x) = 0.5 + 0.5 * sgn(x) * [1 - {alpha/(alpha + |x|)} ^ beta] diff --git a/vp9/common/vp9_entropy.h b/vp9/common/vp9_entropy.h index 4e02630e6..2fc97c3f9 100644 --- a/vp9/common/vp9_entropy.h +++ b/vp9/common/vp9_entropy.h @@ -74,7 +74,6 @@ DECLARE_ALIGNED(16, extern const uint8_t, vp9_cat6_prob_high12[18]); #endif // CONFIG_VP9_HIGHBITDEPTH #define EOB_MODEL_TOKEN 3 -extern const vp9_tree_index vp9_coefmodel_tree[]; typedef struct { const vp9_tree_index *tree; |