shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Removing redundant vp9_pt_energy_class declarations."

--- a/vp9/common/vp9_entropy.h

+++ b/vp9/common/vp9_entropy.h

@@ -36,6 +36,9 @@

 #define INTER_MODE_CONTEXTS     7

+extern DECLARE_ALIGNED(16, const uint8_t,

+                       vp9_pt_energy_class[MAX_ENTROPY_TOKENS]);

+

 extern const vp9_tree_index vp9_coef_tree[];

 #define DCT_EOB_MODEL_TOKEN     3      /* EOB       Extra Bits 0+0 */

--- a/vp9/decoder/vp9_detokenize.c

+++ b/vp9/decoder/vp9_detokenize.c

@@ -61,8 +61,6 @@

   254, 254, 254, 252, 249, 243, 230, 196, 177, 153, 140, 133, 130, 129, 0

 };

-DECLARE_ALIGNED(16, extern const uint8_t,

-                vp9_pt_energy_class[MAX_ENTROPY_TOKENS]);

 #define INCREMENT_COUNT(token)               \

   do {                                       \

     coef_counts[type][ref][band][pt]         \

--- a/vp9/encoder/vp9_encodemb.c

+++ b/vp9/encoder/vp9_encodemb.c

@@ -24,9 +24,6 @@

 #include "vp9/encoder/vp9_rdopt.h"

 #include "vp9/encoder/vp9_tokenize.h"

-DECLARE_ALIGNED(16, extern const uint8_t,

-                vp9_pt_energy_class[MAX_ENTROPY_TOKENS]);

-

 void vp9_subtract_block_c(int rows, int cols,

                           int16_t *diff_ptr, ptrdiff_t diff_stride,

                           const uint8_t *src_ptr, ptrdiff_t src_stride,

--- a/vp9/encoder/vp9_rdopt.c

+++ b/vp9/encoder/vp9_rdopt.c

@@ -45,9 +45,6 @@

 /* Factor to weigh the rate for switchable interp filters */

 #define SWITCHABLE_INTERP_RATE_FACTOR 1

-DECLARE_ALIGNED(16, extern const uint8_t,

-                vp9_pt_energy_class[MAX_ENTROPY_TOKENS]);

-

 #define LAST_FRAME_MODE_MASK    0xFFEDCD60

 #define GOLDEN_FRAME_MODE_MASK  0xFFDA3BB0

 #define ALT_REF_MODE_MASK       0xFFC648D0

--- a/vp9/encoder/vp9_tokenize.c

+++ b/vp9/encoder/vp9_tokenize.c

@@ -29,9 +29,6 @@

 extern vp9_coeff_stats tree_update_hist[TX_SIZES][BLOCK_TYPES];

 #endif  /* ENTROPY_STATS */

-DECLARE_ALIGNED(16, extern const uint8_t,

-                vp9_pt_energy_class[MAX_ENTROPY_TOKENS]);

-

 static TOKENVALUE dct_value_tokens[DCT_MAX_VALUE * 2];

 const TOKENVALUE *vp9_dct_value_tokens_ptr;

 static int dct_value_cost[DCT_MAX_VALUE * 2];