diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2013-07-24 15:53:42 -0700 |
|---|---|---|
| committer | Dmitry Kovalev <dkovalev@google.com> | 2013-07-24 15:53:42 -0700 |
| commit | fcc34796d2376575ecb34d0d381a84b03bc6ad81 (patch) | |
| tree | 314e08e8405e05d93588f3eeb58dee4b2b1cdcf4 /vp9/encoder/vp9_tokenize.c | |
| parent | 1787b0021442f08870f582ac1f2fe9fe6533d078 (diff) | |
| download | libvpx-fcc34796d2376575ecb34d0d381a84b03bc6ad81.tar libvpx-fcc34796d2376575ecb34d0d381a84b03bc6ad81.tar.gz libvpx-fcc34796d2376575ecb34d0d381a84b03bc6ad81.tar.bz2 libvpx-fcc34796d2376575ecb34d0d381a84b03bc6ad81.zip | |
Removing CONFIG_BALANCED_COEFTREE experiment.
Change-Id: I61a8b0101eac3ee2e0621d56151b90c269fd4db4
Diffstat (limited to 'vp9/encoder/vp9_tokenize.c')
| -rw-r--r-- | vp9/encoder/vp9_tokenize.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/vp9/encoder/vp9_tokenize.c b/vp9/encoder/vp9_tokenize.c index 6faa15886..4b9c6c8b4 100644 --- a/vp9/encoder/vp9_tokenize.c +++ b/vp9/encoder/vp9_tokenize.c @@ -196,20 +196,11 @@ static void tokenize_b(int plane, int block, BLOCK_SIZE_TYPE bsize, t->context_tree = coef_probs[type][ref][band][pt]; t->skip_eob_node = (c > 0) && (token_cache[scan[c - 1]] == 0); -#if CONFIG_BALANCED_COEFTREE - assert(token <= ZERO_TOKEN || - vp9_coef_encodings[t->token].len - t->skip_eob_node > 0); -#else assert(vp9_coef_encodings[t->token].len - t->skip_eob_node > 0); -#endif if (!dry_run) { ++counts[type][ref][band][pt][token]; -#if CONFIG_BALANCED_COEFTREE - if (!t->skip_eob_node && token > ZERO_TOKEN) -#else if (!t->skip_eob_node) -#endif ++cpi->common.counts.eob_branch[tx_size][type][ref][band][pt]; } token_cache[scan[c]] = vp9_pt_energy_class[token]; |