Remove add_token_no_extra. It was a fairly small production optimization for VP9. Change-Id: Ie93b474ea5b7e63384a7c0b3a56b135462d1471b (cherry picked from aom/master commit df9bb76b1330de42fe13827df4c72010adb51429)
diff --git a/av1/encoder/tokenize.c b/av1/encoder/tokenize.c index d659607..9def62d 100644 --- a/av1/encoder/tokenize.c +++ b/av1/encoder/tokenize.c
@@ -402,17 +402,6 @@ ++counts[token]; } -static INLINE void add_token_no_extra(TOKENEXTRA **t, - const aom_prob *context_tree, - uint8_t token, uint8_t skip_eob_node, - unsigned int *counts) { - (*t)->token = token; - (*t)->context_tree = context_tree; - (*t)->skip_eob_node = skip_eob_node; - (*t)++; - ++counts[token]; -} - static INLINE int get_tx_eob(const struct segmentation *seg, int segment_id, TX_SIZE tx_size) { const int eob_max = num_4x4_blocks_txsize_lookup[tx_size] << 4; @@ -532,8 +521,11 @@ skip_eob = (token == ZERO_TOKEN); } if (c < seg_eob) { - add_token_no_extra(&t, coef_probs[band[c]][pt], EOB_TOKEN, 0, - counts[band[c]][pt]); + add_token(&t, coef_probs[band[c]][pt], +#if CONFIG_ANS || CONFIG_DAALA_EC + NULL, +#endif + 0, EOB_TOKEN, 0, counts[band[c]][pt]); ++eob_branch[band[c]][pt]; }