From bbcc64772580c8a979288791afa02d30bc476d2e Mon Sep 17 00:00:00 2001 From: trav90 Date: Fri, 19 Oct 2018 21:52:15 -0500 Subject: Update aom to v1.0.0 Update aom to commit id d14c5bb4f336ef1842046089849dee4a301fbbf0. --- third_party/aom/av1/encoder/tokenize.h | 102 ++++----------------------------- 1 file changed, 12 insertions(+), 90 deletions(-) (limited to 'third_party/aom/av1/encoder/tokenize.h') diff --git a/third_party/aom/av1/encoder/tokenize.h b/third_party/aom/av1/encoder/tokenize.h index 20000e502..de1cbe99c 100644 --- a/third_party/aom/av1/encoder/tokenize.h +++ b/third_party/aom/av1/encoder/tokenize.h @@ -13,51 +13,29 @@ #define AV1_ENCODER_TOKENIZE_H_ #include "av1/common/entropy.h" - #include "av1/encoder/block.h" -#include "av1/encoder/treewriter.h" +#include "aom_dsp/bitwriter.h" #ifdef __cplusplus extern "C" { #endif -#define EOSB_TOKEN 127 // Not signalled, encoder only - -#if CONFIG_HIGHBITDEPTH -typedef int32_t EXTRABIT; -#else -typedef int16_t EXTRABIT; -#endif - -typedef struct { - int16_t token; - EXTRABIT extra; -} TOKENVALUE; - typedef struct { - aom_cdf_prob (*tail_cdf)[CDF_SIZE(ENTROPY_TOKENS)]; - aom_cdf_prob (*head_cdf)[CDF_SIZE(ENTROPY_TOKENS)]; aom_cdf_prob *color_map_cdf; - int eob_val; - int first_val; - const aom_prob *context_tree; - EXTRABIT extra; + // TODO(yaowu: use packed enum type if appropriate) uint8_t token; } TOKENEXTRA; -extern const aom_tree_index av1_coef_tree[]; -extern const aom_tree_index av1_coef_con_tree[]; - -int av1_is_skippable_in_plane(MACROBLOCK *x, BLOCK_SIZE bsize, int plane); - struct AV1_COMP; struct ThreadData; +struct FRAME_COUNTS; struct tokenize_b_args { const struct AV1_COMP *cpi; struct ThreadData *td; TOKENEXTRA **tp; int this_rate; + uint8_t allow_update_cdf; }; typedef enum { @@ -69,78 +47,22 @@ typedef enum { // Note in all the tokenize functions rate if non NULL is incremented // with the coefficient token cost only if dry_run = DRY_RUN_COSTCOEFS, // otherwise rate is not incremented. -#if CONFIG_VAR_TX void av1_tokenize_sb_vartx(const struct AV1_COMP *cpi, struct ThreadData *td, TOKENEXTRA **t, RUN_TYPE dry_run, int mi_row, - int mi_col, BLOCK_SIZE bsize, int *rate); -#endif + int mi_col, BLOCK_SIZE bsize, int *rate, + uint8_t allow_update_cdf); -int av1_cost_color_map(const MACROBLOCK *const x, int plane, int block, - BLOCK_SIZE bsize, TX_SIZE tx_size, COLOR_MAP_TYPE type); +int av1_cost_color_map(const MACROBLOCK *const x, int plane, BLOCK_SIZE bsize, + TX_SIZE tx_size, COLOR_MAP_TYPE type); -void av1_tokenize_color_map(const MACROBLOCK *const x, int plane, int block, +void av1_tokenize_color_map(const MACROBLOCK *const x, int plane, TOKENEXTRA **t, BLOCK_SIZE bsize, TX_SIZE tx_size, - COLOR_MAP_TYPE type); - -void av1_tokenize_sb(const struct AV1_COMP *cpi, struct ThreadData *td, - TOKENEXTRA **t, RUN_TYPE dry_run, BLOCK_SIZE bsize, - int *rate, const int mi_row, const int mi_col); -#if CONFIG_SUPERTX -void av1_tokenize_sb_supertx(const struct AV1_COMP *cpi, struct ThreadData *td, - TOKENEXTRA **t, RUN_TYPE dry_run, int mi_row, - int mi_col, BLOCK_SIZE bsize, int *rate); -#endif - -extern const int16_t *av1_dct_value_cost_ptr; -/* TODO: The Token field should be broken out into a separate char array to - * improve cache locality, since it's needed for costing when the rest of the - * fields are not. - */ -extern const TOKENVALUE *av1_dct_value_tokens_ptr; -extern const TOKENVALUE *av1_dct_cat_lt_10_value_tokens; -extern const int *av1_dct_cat_lt_10_value_cost; -extern const int16_t av1_cat6_low_cost[256]; -#if CONFIG_HIGHBITDEPTH -#define CAT6_HIGH_COST_ENTRIES 1024 -#else -#define CAT6_HIGH_COST_ENTRIES 64 -#endif -extern const int av1_cat6_high_cost[CAT6_HIGH_COST_ENTRIES]; -extern const uint8_t av1_cat6_skipped_bits_discount[8]; - -static INLINE void av1_get_token_extra(int v, int16_t *token, EXTRABIT *extra) { - if (v >= CAT6_MIN_VAL || v <= -CAT6_MIN_VAL) { - *token = CATEGORY6_TOKEN; - if (v >= CAT6_MIN_VAL) - *extra = 2 * v - 2 * CAT6_MIN_VAL; - else - *extra = -2 * v - 2 * CAT6_MIN_VAL + 1; - return; - } - *token = av1_dct_cat_lt_10_value_tokens[v].token; - *extra = av1_dct_cat_lt_10_value_tokens[v].extra; -} -static INLINE int16_t av1_get_token(int v) { - if (v >= CAT6_MIN_VAL || v <= -CAT6_MIN_VAL) return 10; - return av1_dct_cat_lt_10_value_tokens[v].token; -} - -static INLINE int av1_get_token_cost(int v, int16_t *token, int cat6_bits) { - if (v >= CAT6_MIN_VAL || v <= -CAT6_MIN_VAL) { - EXTRABIT extrabits; - *token = CATEGORY6_TOKEN; - extrabits = abs(v) - CAT6_MIN_VAL; - return av1_cat6_low_cost[extrabits & 0xff] + - av1_cat6_high_cost[extrabits >> 8] - - av1_cat6_skipped_bits_discount[18 - cat6_bits]; - } - *token = av1_dct_cat_lt_10_value_tokens[v].token; - return av1_dct_cat_lt_10_value_cost[v]; -} + COLOR_MAP_TYPE type, int allow_update_cdf, + struct FRAME_COUNTS *counts); static INLINE int av1_get_tx_eob(const struct segmentation *seg, int segment_id, TX_SIZE tx_size) { - const int eob_max = tx_size_2d[tx_size]; + const int eob_max = av1_get_max_eob(tx_size); return segfeature_active(seg, segment_id, SEG_LVL_SKIP) ? 0 : eob_max; } -- cgit v1.2.3