shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "vp9: make some static tables const"

--- a/vp9/common/vp9_mvref_common.c

+++ b/vp9/common/vp9_mvref_common.c

@@ -11,7 +11,7 @@

 #include "vp9/common/vp9_mvref_common.h"

 #define MVREF_NEIGHBOURS 8

-static int mv_ref_blocks[BLOCK_SIZE_TYPES][MVREF_NEIGHBOURS][2] = {

+static const int mv_ref_blocks[BLOCK_SIZE_TYPES][MVREF_NEIGHBOURS][2] = {

   // SB4X4

   {{0, -1}, {-1, 0}, {-1, -1}, {0, -2}, {-2, 0}, {-1, -2}, {-2, -1}, {-2, -2}},

   // SB4X8

@@ -150,7 +150,7 @@

   int candidate_scores[MAX_MV_REF_CANDIDATES] = { 0 };

   int refmv_count = 0;

   int split_count = 0;

-  int (*mv_ref_search)[2];

+  const int (*mv_ref_search)[2] = mv_ref_blocks[mbmi->sb_type];

   const int mi_col = get_mi_col(xd);

   const int mi_row = get_mi_row(xd);

   int intra_count = 0;

@@ -161,7 +161,6 @@

   // Blank the reference vector lists and other local structures.

   vpx_memset(mv_ref_list, 0, sizeof(int_mv) * MAX_MV_REF_CANDIDATES);

-  mv_ref_search = mv_ref_blocks[mbmi->sb_type];

   if (mbmi->sb_type < BLOCK_SIZE_SB8X8) {

     x_idx = block_idx & 1;

     y_idx = block_idx >> 1;

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

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

@@ -136,10 +136,12 @@

           }

 }

-static int rd_iifactor[32] =  { 4, 4, 3, 2, 1, 0, 0, 0,

-                                0, 0, 0, 0, 0, 0, 0, 0,

-                                0, 0, 0, 0, 0, 0, 0, 0,

-                                0, 0, 0, 0, 0, 0, 0, 0, };

+static const int rd_iifactor[32] = {

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

+  0, 0, 0, 0, 0, 0, 0, 0,

+  0, 0, 0, 0, 0, 0, 0, 0,

+  0, 0, 0, 0, 0, 0, 0, 0,

+};

 // 3* dc_qlookup[Q]*dc_qlookup[Q];

--- a/vp9/encoder/vp9_subexp.c

+++ b/vp9/encoder/vp9_subexp.c

@@ -50,7 +50,7 @@

 static int remap_prob(int v, int m) {

   int i;

-  static int map_table[MAX_PROB - 1] = {

+  static const int map_table[MAX_PROB - 1] = {

     // generated by:

     //   map_table[j] = split_index(j, MAX_PROB - 1, MODULUS_PARAM);

      20,  21,  22,  23,  24,  25,   0,  26,  27,  28,  29,  30,  31,  32,  33,