shithub: libvpx

Info  •  Files  •  Log  •  Branches

vp9: normalize DECLARE_ALIGNED use on global tables

- place extern within the macro
- use in the header only

Change-Id: I4274b345d8af9ef329c0eb9553a3ddaad70d1d26

--- a/vp9/common/vp9_entropy.c

+++ b/vp9/common/vp9_entropy.c

@@ -16,7 +16,7 @@

 #include "vpx/vpx_integer.h"

-DECLARE_ALIGNED(16, const uint8_t, vp9_coefband_trans_8x8plus[1024]) = {

+const uint8_t vp9_coefband_trans_8x8plus[1024] = {

   0, 1, 1, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4,

   4, 4, 4, 4, 4, 5,

   // beyond MAXBAND_INDEX+1 all values are filled as 5

@@ -85,11 +85,11 @@

   5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,

 };

-DECLARE_ALIGNED(16, const uint8_t, vp9_coefband_trans_4x4[16]) = {

+const uint8_t vp9_coefband_trans_4x4[16] = {

   0, 1, 1, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 5, 5, 5,

 };

-DECLARE_ALIGNED(16, const uint8_t, vp9_pt_energy_class[ENTROPY_TOKENS]) = {

+const uint8_t vp9_pt_energy_class[ENTROPY_TOKENS] = {

   0, 1, 2, 3, 3, 4, 4, 5, 5, 5, 5, 5

 };

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

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

@@ -42,7 +42,7 @@

 #define ENTROPY_NODES 11

-extern DECLARE_ALIGNED(16, const uint8_t, vp9_pt_energy_class[ENTROPY_TOKENS]);

+DECLARE_ALIGNED(16, extern const uint8_t, vp9_pt_energy_class[ENTROPY_TOKENS]);

 #define EOB_MODEL_TOKEN 3

 extern const vp9_tree_index vp9_coefmodel_tree[];

@@ -116,8 +116,8 @@

 // This macro is currently unused but may be used by certain implementations

 #define MAXBAND_INDEX 21

-extern DECLARE_ALIGNED(16, const uint8_t, vp9_coefband_trans_8x8plus[1024]);

-extern DECLARE_ALIGNED(16, const uint8_t, vp9_coefband_trans_4x4[16]);

+DECLARE_ALIGNED(16, extern const uint8_t, vp9_coefband_trans_8x8plus[1024]);

+DECLARE_ALIGNED(16, extern const uint8_t, vp9_coefband_trans_4x4[16]);

 static INLINE const uint8_t *get_band_translate(TX_SIZE tx_size) {

   return tx_size == TX_4X4 ? vp9_coefband_trans_4x4

--- a/vp9/common/vp9_prob.c

+++ b/vp9/common/vp9_prob.c

@@ -10,7 +10,7 @@

 #include "vp9/common/vp9_prob.h"

-DECLARE_ALIGNED(16, const uint8_t, vp9_norm[256]) = {

+const uint8_t vp9_norm[256] = {

   0, 7, 6, 6, 5, 5, 5, 5, 4, 4, 4, 4, 4, 4, 4, 4,

   3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,

   2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,