Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b1123d4 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

am 354ac772: Merge "stagefright amrwb: Make local const arrays static" 

* commit '354ac772eca0afea25dd12d233e5cdee9677888b':
  stagefright amrwb: Make local const arrays static
parents 67caa6df 94530642

media/libstagefright/codecs/amrwb/src/homing_amr_wb_dec.cpp

+10 −10
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ extern "C" 
; LOCAL STORE/BUFFER/POINTER DEFINITIONS

; Variable declaration - defined here and used outside this module

----------------------------------------------------------------------------*/

const int16 prmnofsf[NUM_OF_SPMODES] =

static const int16 prmnofsf[NUM_OF_SPMODES] =

{

    63,  81, 100,

    108, 116, 128,
@@ -142,21 +142,21 @@ const int16 prmnofsf[NUM_OF_SPMODES] = 
};





const int16 dfh_M7k[PRMN_7k] =

static const int16 dfh_M7k[PRMN_7k] =

{

    3168, 29954, 29213, 16121,

    64, 13440, 30624, 16430,

    19008

};



const int16 dfh_M9k[PRMN_9k] =

static const int16 dfh_M9k[PRMN_9k] =

{

    3168, 31665,  9943, 9123,

    15599,  4358, 20248, 2048,

    17040, 27787, 16816, 13888

};



const int16 dfh_M12k[PRMN_12k] =

static const int16 dfh_M12k[PRMN_12k] =

{

    3168, 31665,  9943,  9128,

    3647,  8129, 30930, 27926,
@@ -165,7 +165,7 @@ const int16 dfh_M12k[PRMN_12k] = 
    13948

};



const int16 dfh_M14k[PRMN_14k] =

static const int16 dfh_M14k[PRMN_14k] =

{

    3168, 31665,  9943,  9131,

    24815,   655, 26616, 26764,
@@ -174,7 +174,7 @@ const int16 dfh_M14k[PRMN_14k] = 
    221, 20321, 17823

};



const int16 dfh_M16k[PRMN_16k] =

static const int16 dfh_M16k[PRMN_16k] =

{

    3168, 31665,  9943,  9131,

    24815,   700,  3824,  7271,
@@ -184,7 +184,7 @@ const int16 dfh_M16k[PRMN_16k] = 
    6759, 24576

};



const int16 dfh_M18k[PRMN_18k] =

static const int16 dfh_M18k[PRMN_18k] =

{

    3168, 31665,  9943,  9135,

    14787, 14423, 30477, 24927,
@@ -195,7 +195,7 @@ const int16 dfh_M18k[PRMN_18k] = 
    0

};



const int16 dfh_M20k[PRMN_20k] =

static const int16 dfh_M20k[PRMN_20k] =

{

    3168, 31665,  9943,  9129,

    8637, 31807, 24646,   736,
@@ -206,7 +206,7 @@ const int16 dfh_M20k[PRMN_20k] = 
    30249, 29123, 0

};



const int16 dfh_M23k[PRMN_23k] =

static const int16 dfh_M23k[PRMN_23k] =

{

    3168, 31665,  9943,  9132,

    16748,  3202, 28179, 16317,
@@ -218,7 +218,7 @@ const int16 dfh_M23k[PRMN_23k] = 
    23392, 26053, 31216

};



const int16 dfh_M24k[PRMN_24k] =

static const int16 dfh_M24k[PRMN_24k] =

{

    3168, 31665,  9943,  9134,

    24776,  5857, 18475, 28535,

media/libstagefright/codecs/amrwb/src/isp_isf.cpp

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ terms listed above has been obtained from the copyright holder. 


/* table of cos(x) in Q15 */



const int16 table[129] =

static const int16 table[129] =

{

    32767,

    32758,  32729,  32679,  32610,  32522,  32413,  32286,  32138,

media/libstagefright/codecs/amrwb/src/phase_dispersion.cpp

+2 −2
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ terms listed above has been obtained from the copyright holder. 
/* impulse response with phase dispersion */



/* 2.0 - 6.4 kHz phase dispersion */

const int16 ph_imp_low[L_SUBFR] =

static const int16 ph_imp_low[L_SUBFR] =

{

    20182,  9693,  3270, -3437, 2864, -5240,  1589, -1357,

    600,  3893, -1497,  -698, 1203, -5249,  1199,  5371,
@@ -122,7 +122,7 @@ const int16 ph_imp_low[L_SUBFR] = 
};



/* 3.2 - 6.4 kHz phase dispersion */

const int16 ph_imp_mid[L_SUBFR] =

static const int16 ph_imp_mid[L_SUBFR] =

{

    24098, 10460, -5263,  -763,  2048,  -927,  1753, -3323,

    2212,   652, -2146,  2487, -3539,  4109, -2107,  -374,