Commit 4e04fa6d authored by Jim Bankoski's avatar Jim Bankoski Committed by Gerrit Code Review
Browse files

Merge "make vp9_coef_encodings const"

parents fc954c7c a5f7d78a
......@@ -51,7 +51,6 @@
#include "vp9/encoder/vp9_resize.h"
#include "vp9/encoder/vp9_svc_layercontext.h"
void vp9_coef_tree_initialize();
#define SHARP_FILTER_QTHRESH 0 /* Q threshold for 8-tap sharp filter */
......@@ -187,7 +186,6 @@ void vp9_initialize_enc(void) {
if (!init_done) {
vp9_rtcd();
vp9_init_intra_predictors();
vp9_coef_tree_initialize();
vp9_tokenize_initialize();
vp9_init_me_luts();
vp9_rc_init_minq_luts();
......
......@@ -175,11 +175,10 @@ const vp9_extra_bit vp9_extra_bits_high12[ENTROPY_TOKENS] = {
};
#endif
struct vp9_token vp9_coef_encodings[ENTROPY_TOKENS];
void vp9_coef_tree_initialize() {
vp9_tokens_from_tree(vp9_coef_encodings, vp9_coef_tree);
}
const struct vp9_token vp9_coef_encodings[ENTROPY_TOKENS] = {
{2, 2}, {6, 3}, {28, 5}, {58, 6}, {59, 6}, {60, 6}, {61, 6}, {124, 7},
{125, 7}, {126, 7}, {127, 7}, {0, 1}
};
static void tokenize_init_one(const vp9_extra_bit *const e,
int16_t *value_cost, int max_value) {
......
......@@ -45,7 +45,7 @@ typedef struct {
extern const vp9_tree_index vp9_coef_tree[];
extern const vp9_tree_index vp9_coef_con_tree[];
extern struct vp9_token vp9_coef_encodings[];
extern const struct vp9_token vp9_coef_encodings[];
int vp9_is_skippable_in_plane(MACROBLOCK *x, BLOCK_SIZE bsize, int plane);
int vp9_has_high_freq_in_plane(MACROBLOCK *x, BLOCK_SIZE bsize, int plane);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment