diff options
Diffstat (limited to 'media')
29 files changed, 93 insertions, 67 deletions
diff --git a/media/libstagefright/codecs/amrnb/common/include/az_lsp.h b/media/libstagefright/codecs/amrnb/common/include/az_lsp.h index 3e15ba3..7c24ca9 100644 --- a/media/libstagefright/codecs/amrnb/common/include/az_lsp.h +++ b/media/libstagefright/codecs/amrnb/common/include/az_lsp.h @@ -83,7 +83,7 @@ extern "C" ; EXTERNAL VARIABLES REFERENCES ; Declare variables used in this module but defined elsewhere ----------------------------------------------------------------------------*/ - extern Word16 grid[]; + extern const Word16 grid[]; /*---------------------------------------------------------------------------- ; SIMPLE TYPEDEF'S diff --git a/media/libstagefright/codecs/amrnb/common/include/inv_sqrt.h b/media/libstagefright/codecs/amrnb/common/include/inv_sqrt.h index 4fb2b11..91ab3e4 100644 --- a/media/libstagefright/codecs/amrnb/common/include/inv_sqrt.h +++ b/media/libstagefright/codecs/amrnb/common/include/inv_sqrt.h @@ -85,7 +85,7 @@ extern "C" ; EXTERNAL VARIABLES REFERENCES ; Declare variables used in this module but defined elsewhere ----------------------------------------------------------------------------*/ - extern Word16 inv_sqrt_tbl[]; + extern const Word16 inv_sqrt_tbl[]; /*---------------------------------------------------------------------------- ; SIMPLE TYPEDEF'S ----------------------------------------------------------------------------*/ diff --git a/media/libstagefright/codecs/amrnb/common/include/log2_norm.h b/media/libstagefright/codecs/amrnb/common/include/log2_norm.h index b104a69..46b4e4d 100644 --- a/media/libstagefright/codecs/amrnb/common/include/log2_norm.h +++ b/media/libstagefright/codecs/amrnb/common/include/log2_norm.h @@ -85,7 +85,7 @@ extern "C" ; EXTERNAL VARIABLES REFERENCES ; Declare variables used in this module but defined elsewhere ----------------------------------------------------------------------------*/ - extern Word16 log2_tbl[]; + extern const Word16 log2_tbl[]; /*---------------------------------------------------------------------------- ; SIMPLE TYPEDEF'S ----------------------------------------------------------------------------*/ diff --git a/media/libstagefright/codecs/amrnb/common/include/pow2.h b/media/libstagefright/codecs/amrnb/common/include/pow2.h index c96fbdd..9b944eb 100644 --- a/media/libstagefright/codecs/amrnb/common/include/pow2.h +++ b/media/libstagefright/codecs/amrnb/common/include/pow2.h @@ -81,7 +81,7 @@ extern "C" ; EXTERNAL VARIABLES REFERENCES ; Declare variables used in this module but defined elsewhere ----------------------------------------------------------------------------*/ - extern Word16 pow2_tbl[]; + extern const Word16 pow2_tbl[]; /*---------------------------------------------------------------------------- ; SIMPLE TYPEDEF'S ----------------------------------------------------------------------------*/ diff --git a/media/libstagefright/codecs/amrnb/common/include/sqrt_l.h b/media/libstagefright/codecs/amrnb/common/include/sqrt_l.h index 86209bd..a6a2ee5 100644 --- a/media/libstagefright/codecs/amrnb/common/include/sqrt_l.h +++ b/media/libstagefright/codecs/amrnb/common/include/sqrt_l.h @@ -82,7 +82,7 @@ extern "C" ; EXTERNAL VARIABLES REFERENCES ; Declare variables used in this module but defined elsewhere ----------------------------------------------------------------------------*/ - extern Word16 sqrt_l_tbl[]; + extern const Word16 sqrt_l_tbl[]; /*---------------------------------------------------------------------------- ; SIMPLE TYPEDEF'S diff --git a/media/libstagefright/codecs/amrnb/common/src/bitno_tab.cpp b/media/libstagefright/codecs/amrnb/common/src/bitno_tab.cpp index fed684d..4ee04a5 100644 --- a/media/libstagefright/codecs/amrnb/common/src/bitno_tab.cpp +++ b/media/libstagefright/codecs/amrnb/common/src/bitno_tab.cpp @@ -152,7 +152,7 @@ extern "C" ; Variable declaration - defined here and used outside this module ----------------------------------------------------------------------------*/ /* number of parameters per modes (values must be <= MAX_PRM_SIZE!) */ - extern const Word16 prmno[N_MODES] = + const Word16 prmno[N_MODES] = { PRMNO_MR475, PRMNO_MR515, @@ -166,7 +166,7 @@ extern "C" }; /* number of parameters to first subframe per modes */ - extern const Word16 prmnofsf[N_MODES - 1] = + const Word16 prmnofsf[N_MODES - 1] = { PRMNOFSF_MR475, PRMNOFSF_MR515, @@ -179,7 +179,7 @@ extern "C" }; /* parameter sizes (# of bits), one table per mode */ - extern const Word16 bitno_MR475[PRMNO_MR475] = + const Word16 bitno_MR475[PRMNO_MR475] = { 8, 8, 7, /* LSP VQ */ 8, 7, 2, 8, /* first subframe */ @@ -188,7 +188,7 @@ extern "C" 4, 7, 2, /* fourth subframe */ }; - extern const Word16 bitno_MR515[PRMNO_MR515] = + const Word16 bitno_MR515[PRMNO_MR515] = { 8, 8, 7, /* LSP VQ */ 8, 7, 2, 6, /* first subframe */ @@ -197,7 +197,7 @@ extern "C" 4, 7, 2, 6, /* fourth subframe */ }; - extern const Word16 bitno_MR59[PRMNO_MR59] = + const Word16 bitno_MR59[PRMNO_MR59] = { 8, 9, 9, /* LSP VQ */ 8, 9, 2, 6, /* first subframe */ @@ -206,7 +206,7 @@ extern "C" 4, 9, 2, 6, /* fourth subframe */ }; - extern const Word16 bitno_MR67[PRMNO_MR67] = + const Word16 bitno_MR67[PRMNO_MR67] = { 8, 9, 9, /* LSP VQ */ 8, 11, 3, 7, /* first subframe */ @@ -215,7 +215,7 @@ extern "C" 4, 11, 3, 7, /* fourth subframe */ }; - extern const Word16 bitno_MR74[PRMNO_MR74] = + const Word16 bitno_MR74[PRMNO_MR74] = { 8, 9, 9, /* LSP VQ */ 8, 13, 4, 7, /* first subframe */ @@ -224,7 +224,7 @@ extern "C" 5, 13, 4, 7, /* fourth subframe */ }; - extern const Word16 bitno_MR795[PRMNO_MR795] = + const Word16 bitno_MR795[PRMNO_MR795] = { 9, 9, 9, /* LSP VQ */ 8, 13, 4, 4, 5, /* first subframe */ @@ -233,7 +233,7 @@ extern "C" 6, 13, 4, 4, 5, /* fourth subframe */ }; - extern const Word16 bitno_MR102[PRMNO_MR102] = + const Word16 bitno_MR102[PRMNO_MR102] = { 8, 9, 9, /* LSP VQ */ 8, 1, 1, 1, 1, 10, 10, 7, 7, /* first subframe */ @@ -242,7 +242,7 @@ extern "C" 5, 1, 1, 1, 1, 10, 10, 7, 7, /* fourth subframe */ }; - extern const Word16 bitno_MR122[PRMNO_MR122] = + const Word16 bitno_MR122[PRMNO_MR122] = { 7, 8, 9, 8, 6, /* LSP VQ */ 9, 4, 4, 4, 4, 4, 4, 3, 3, 3, 3, 3, 5, /* first subframe */ @@ -251,7 +251,7 @@ extern "C" 6, 4, 4, 4, 4, 4, 4, 3, 3, 3, 3, 3, 5 /* fourth subframe */ }; - extern const Word16 bitno_MRDTX[PRMNO_MRDTX] = + const Word16 bitno_MRDTX[PRMNO_MRDTX] = { 3, 8, 9, 9, @@ -259,7 +259,7 @@ extern "C" }; /* overall table with all parameter sizes for all modes */ - extern const Word16 * const bitno[N_MODES] = + const Word16 * const bitno[N_MODES] = { bitno_MR475, bitno_MR515, diff --git a/media/libstagefright/codecs/amrnb/common/src/bitreorder_tab.cpp b/media/libstagefright/codecs/amrnb/common/src/bitreorder_tab.cpp index 69b20fb..e284bbc 100644 --- a/media/libstagefright/codecs/amrnb/common/src/bitreorder_tab.cpp +++ b/media/libstagefright/codecs/amrnb/common/src/bitreorder_tab.cpp @@ -123,6 +123,7 @@ terms listed above has been obtained from the copyright holder. ; INCLUDES ----------------------------------------------------------------------------*/ #include "typedef.h" +#include "bitreorder_tab.h" /*--------------------------------------------------------------------------*/ #ifdef __cplusplus @@ -171,7 +172,7 @@ extern "C" ; Variable declaration - defined here and used outside this module ----------------------------------------------------------------------------*/ /* number of parameters per modes (values must be <= MAX_PRM_SIZE!) */ - extern const Word16 numOfBits[NUM_MODES] = + const Word16 numOfBits[NUM_MODES] = { NUMBIT_MR475, NUMBIT_MR515, @@ -191,7 +192,7 @@ extern "C" NUMBIT_NO_DATA }; - extern const Word16 reorderBits_MR475[NUMBIT_MR475] = + const Word16 reorderBits_MR475[NUMBIT_MR475] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 23, 24, 25, 26, @@ -205,7 +206,7 @@ extern "C" 92, 31, 52, 65, 86 }; - extern const Word16 reorderBits_MR515[NUMBIT_MR515] = + const Word16 reorderBits_MR515[NUMBIT_MR515] = { 7, 6, 5, 4, 3, 2, 1, 0, 15, 14, 13, 12, 11, 10, 9, 8, 23, 24, 25, 26, @@ -220,7 +221,7 @@ extern "C" 53, 72, 91 }; - extern const Word16 reorderBits_MR59[NUMBIT_MR59] = + const Word16 reorderBits_MR59[NUMBIT_MR59] = { 0, 1, 4, 5, 3, 6, 7, 2, 13, 15, 8, 9, 11, 12, 14, 10, 16, 28, 74, 29, @@ -236,7 +237,7 @@ extern "C" 38, 59, 84, 105, 37, 58, 83, 104 }; - extern const Word16 reorderBits_MR67[NUMBIT_MR67] = + const Word16 reorderBits_MR67[NUMBIT_MR67] = { 0, 1, 4, 3, 5, 6, 13, 7, 2, 8, 9, 11, 15, 12, 14, 10, 28, 82, 29, 83, @@ -254,7 +255,7 @@ extern "C" 36, 61, 90, 115 }; - extern const Word16 reorderBits_MR74[NUMBIT_MR74] = + const Word16 reorderBits_MR74[NUMBIT_MR74] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 26, 87, 27, @@ -273,7 +274,7 @@ extern "C" 39, 68, 100, 129, 40, 69, 101, 130 }; - extern const Word16 reorderBits_MR795[NUMBIT_MR795] = + const Word16 reorderBits_MR795[NUMBIT_MR795] = { 8, 7, 6, 5, 4, 3, 2, 14, 16, 9, 10, 12, 13, 15, 11, 17, 20, 22, 24, 23, @@ -293,7 +294,7 @@ extern "C" 139, 37, 69, 103, 135, 38, 70, 104, 136 }; - extern const Word16 reorderBits_MR102[NUMBIT_MR102] = + const Word16 reorderBits_MR102[NUMBIT_MR102] = { 7, 6, 5, 4, 3, 2, 1, 0, 16, 15, 14, 13, 12, 11, 10, 9, 8, 26, 27, 28, @@ -318,7 +319,7 @@ extern "C" 63, 46, 55, 56 }; - extern const Word16 reorderBits_MR122[NUMBIT_MR122] = + const Word16 reorderBits_MR122[NUMBIT_MR122] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 23, 15, 16, 17, 18, @@ -348,7 +349,7 @@ extern "C" }; /* overall table with all parameter sizes for all modes */ - extern const Word16 * const reorderBits[NUM_MODES-1] = + const Word16 * const reorderBits[NUM_MODES-1] = { reorderBits_MR475, reorderBits_MR515, @@ -361,7 +362,7 @@ extern "C" }; /* Number of Frames (16-bit segments sent for each mode */ - extern const Word16 numCompressedBytes[16] = + const Word16 numCompressedBytes[16] = { 13, /*4.75*/ 14, /*5.15*/ diff --git a/media/libstagefright/codecs/amrnb/common/src/bytesused.cpp b/media/libstagefright/codecs/amrnb/common/src/bytesused.cpp index 9552206..b61bac4 100644 --- a/media/libstagefright/codecs/amrnb/common/src/bytesused.cpp +++ b/media/libstagefright/codecs/amrnb/common/src/bytesused.cpp @@ -152,7 +152,7 @@ extern "C" ; LOCAL STORE/BUFFER/POINTER DEFINITIONS ; Variable declaration - defined here and used outside this module ----------------------------------------------------------------------------*/ - extern const short BytesUsed[16] = + const short BytesUsed[16] = { 13, /* 4.75 */ 14, /* 5.15 */ diff --git a/media/libstagefright/codecs/amrnb/common/src/c2_9pf_tab.cpp b/media/libstagefright/codecs/amrnb/common/src/c2_9pf_tab.cpp index 471bee8..20de9d6 100644 --- a/media/libstagefright/codecs/amrnb/common/src/c2_9pf_tab.cpp +++ b/media/libstagefright/codecs/amrnb/common/src/c2_9pf_tab.cpp @@ -86,7 +86,8 @@ extern "C" ; LOCAL VARIABLE DEFINITIONS ; [Variable declaration - defined here and used outside this module] ----------------------------------------------------------------------------*/ - extern const Word16 startPos[2*4*2] = {0, 2, 0, 3, + extern const Word16 startPos[]; + const Word16 startPos[2*4*2] = {0, 2, 0, 3, 0, 2, 0, 3, 1, 3, 2, 4, 1, 4, 1, 4 diff --git a/media/libstagefright/codecs/amrnb/common/src/gains_tbl.cpp b/media/libstagefright/codecs/amrnb/common/src/gains_tbl.cpp index a08dd2d..a7cd6fb 100644 --- a/media/libstagefright/codecs/amrnb/common/src/gains_tbl.cpp +++ b/media/libstagefright/codecs/amrnb/common/src/gains_tbl.cpp @@ -86,14 +86,16 @@ extern "C" ----------------------------------------------------------------------------*/ - extern const Word16 qua_gain_pitch[NB_QUA_PITCH] = + extern const Word16 qua_gain_pitch[]; + const Word16 qua_gain_pitch[NB_QUA_PITCH] = { 0, 3277, 6556, 8192, 9830, 11469, 12288, 13107, 13926, 14746, 15565, 16384, 17203, 18022, 18842, 19661 }; - extern const Word16 qua_gain_code[(NB_QUA_CODE+1)*3] = + extern const Word16 qua_gain_code[]; + const Word16 qua_gain_code[(NB_QUA_CODE+1)*3] = { /* gain factor (g_fac) and quantized energy error (qua_ener_MR122, qua_ener) * are stored: diff --git a/media/libstagefright/codecs/amrnb/common/src/gray_tbl.cpp b/media/libstagefright/codecs/amrnb/common/src/gray_tbl.cpp index 99073d9..c4b2dbc 100644 --- a/media/libstagefright/codecs/amrnb/common/src/gray_tbl.cpp +++ b/media/libstagefright/codecs/amrnb/common/src/gray_tbl.cpp @@ -83,8 +83,10 @@ extern "C" ; [Variable declaration - defined here and used outside this module] ----------------------------------------------------------------------------*/ - extern const Word16 gray[8] = {0, 1, 3, 2, 6, 4, 5, 7}; - extern const Word16 dgray[8] = {0, 1, 3, 2, 5, 6, 4, 7}; + extern const Word16 gray[]; + extern const Word16 dgray[]; + const Word16 gray[8] = {0, 1, 3, 2, 6, 4, 5, 7}; + const Word16 dgray[8] = {0, 1, 3, 2, 5, 6, 4, 7}; /*--------------------------------------------------------------------------*/ #ifdef __cplusplus diff --git a/media/libstagefright/codecs/amrnb/common/src/grid_tbl.cpp b/media/libstagefright/codecs/amrnb/common/src/grid_tbl.cpp index cd81566..48566cc 100644 --- a/media/libstagefright/codecs/amrnb/common/src/grid_tbl.cpp +++ b/media/libstagefright/codecs/amrnb/common/src/grid_tbl.cpp @@ -63,6 +63,7 @@ terms listed above has been obtained from the copyright holder. ; INCLUDES ----------------------------------------------------------------------------*/ #include "typedef.h" +#include "az_lsp.h" /*--------------------------------------------------------------------------*/ #ifdef __cplusplus @@ -91,7 +92,7 @@ extern "C" ; LOCAL VARIABLE DEFINITIONS ; [Variable declaration - defined here and used outside this module] ----------------------------------------------------------------------------*/ - extern const Word16 grid[grid_points + 1] = + const Word16 grid[grid_points + 1] = { 32760, 32723, 32588, 32364, 32051, 31651, 31164, 30591, 29935, 29196, 28377, 27481, diff --git a/media/libstagefright/codecs/amrnb/common/src/inv_sqrt_tbl.cpp b/media/libstagefright/codecs/amrnb/common/src/inv_sqrt_tbl.cpp index bde2c4e..13c3b24 100644 --- a/media/libstagefright/codecs/amrnb/common/src/inv_sqrt_tbl.cpp +++ b/media/libstagefright/codecs/amrnb/common/src/inv_sqrt_tbl.cpp @@ -55,6 +55,7 @@ terms listed above has been obtained from the copyright holder. ; INCLUDES ----------------------------------------------------------------------------*/ #include "typedef.h" +#include "inv_sqrt.h" /*--------------------------------------------------------------------------*/ #ifdef __cplusplus @@ -82,7 +83,7 @@ extern "C" ; LOCAL VARIABLE DEFINITIONS ; [Variable declaration - defined here and used outside this module] ----------------------------------------------------------------------------*/ - extern const Word16 inv_sqrt_tbl[49] = + const Word16 inv_sqrt_tbl[49] = { 32767, 31790, 30894, 30070, 29309, 28602, 27945, 27330, 26755, 26214, diff --git a/media/libstagefright/codecs/amrnb/common/src/log2_tbl.cpp b/media/libstagefright/codecs/amrnb/common/src/log2_tbl.cpp index 25d63b2..9b9b099 100644 --- a/media/libstagefright/codecs/amrnb/common/src/log2_tbl.cpp +++ b/media/libstagefright/codecs/amrnb/common/src/log2_tbl.cpp @@ -54,6 +54,7 @@ terms listed above has been obtained from the copyright holder. ; INCLUDES ----------------------------------------------------------------------------*/ #include "typedef.h" +#include "log2_norm.h" /*--------------------------------------------------------------------------*/ #ifdef __cplusplus @@ -82,7 +83,7 @@ extern "C" ; [Variable declaration - defined here and used outside this module] ----------------------------------------------------------------------------*/ - extern const Word16 log2_tbl[33] = + const Word16 log2_tbl[33] = { 0, 1455, 2866, 4236, 5568, 6863, 8124, 9352, 10549, 11716, 12855, 13967, 15054, 16117, 17156, 18172, 19167, 20142, 21097, 22033, diff --git a/media/libstagefright/codecs/amrnb/common/src/lsp_lsf_tbl.cpp b/media/libstagefright/codecs/amrnb/common/src/lsp_lsf_tbl.cpp index cee0f32..ddeeba4 100644 --- a/media/libstagefright/codecs/amrnb/common/src/lsp_lsf_tbl.cpp +++ b/media/libstagefright/codecs/amrnb/common/src/lsp_lsf_tbl.cpp @@ -77,7 +77,8 @@ extern "C" ; [Variable declaration - defined here and used outside this module] ----------------------------------------------------------------------------*/ - extern const Word16 table[65] = + extern const Word16 table[]; + const Word16 table[65] = { 32767, 32729, 32610, 32413, 32138, 31786, 31357, 30853, 30274, 29622, 28899, 28106, 27246, 26320, 25330, 24279, @@ -94,7 +95,8 @@ extern "C" /* slope used to compute y = acos(x) */ - extern const Word16 slope[64] = + extern const Word16 slope[]; + const Word16 slope[64] = { -26887, -8812, -5323, -3813, -2979, -2444, -2081, -1811, -1608, -1450, -1322, -1219, -1132, -1059, -998, -946, diff --git a/media/libstagefright/codecs/amrnb/common/src/lsp_tab.cpp b/media/libstagefright/codecs/amrnb/common/src/lsp_tab.cpp index deded93..0a32dd7 100644 --- a/media/libstagefright/codecs/amrnb/common/src/lsp_tab.cpp +++ b/media/libstagefright/codecs/amrnb/common/src/lsp_tab.cpp @@ -117,6 +117,7 @@ terms listed above has been obtained from the copyright holder. ----------------------------------------------------------------------------*/ #include "typedef.h" #include "cnst.h" +#include "lsp_tab.h" /*--------------------------------------------------------------------------*/ #ifdef __cplusplus @@ -146,7 +147,7 @@ extern "C" ; LOCAL STORE/BUFFER/POINTER DEFINITIONS ; Variable declaration - defined here and used outside this module ----------------------------------------------------------------------------*/ - extern const Word16 lsp_init_data[M] = {30000, 26000, 21000, 15000, 8000, + const Word16 lsp_init_data[M] = {30000, 26000, 21000, 15000, 8000, 0, -8000, -15000, -21000, -26000 }; diff --git a/media/libstagefright/codecs/amrnb/common/src/overflow_tbl.cpp b/media/libstagefright/codecs/amrnb/common/src/overflow_tbl.cpp index e5d42d6..c4a016d 100644 --- a/media/libstagefright/codecs/amrnb/common/src/overflow_tbl.cpp +++ b/media/libstagefright/codecs/amrnb/common/src/overflow_tbl.cpp @@ -81,7 +81,7 @@ extern "C" ; LOCAL VARIABLE DEFINITIONS ; [Variable declaration - defined here and used outside this module] ----------------------------------------------------------------------------*/ - extern const Word32 overflow_tbl [32] = {0x7fffffffL, 0x3fffffffL, + const Word32 overflow_tbl [32] = {0x7fffffffL, 0x3fffffffL, 0x1fffffffL, 0x0fffffffL, 0x07ffffffL, 0x03ffffffL, 0x01ffffffL, 0x00ffffffL, diff --git a/media/libstagefright/codecs/amrnb/common/src/ph_disp_tab.cpp b/media/libstagefright/codecs/amrnb/common/src/ph_disp_tab.cpp index 99725df..d568b78 100644 --- a/media/libstagefright/codecs/amrnb/common/src/ph_disp_tab.cpp +++ b/media/libstagefright/codecs/amrnb/common/src/ph_disp_tab.cpp @@ -81,14 +81,16 @@ extern "C" ; LOCAL VARIABLE DEFINITIONS ; [Variable declaration - defined here and used outside this module] ----------------------------------------------------------------------------*/ - extern const Word16 ph_imp_low_MR795[40] = + extern const Word16 ph_imp_low_MR795[]; + const Word16 ph_imp_low_MR795[40] = { 26777, 801, 2505, -683, -1382, 582, 604, -1274, 3511, -5894, 4534, -499, -1940, 3011, -5058, 5614, -1990, -1061, -1459, 4442, -700, -5335, 4609, 452, -589, -3352, 2953, 1267, -1212, -2590, 1731, 3670, -4475, -975, 4391, -2537, 949, -1363, -979, 5734 }; - extern const Word16 ph_imp_mid_MR795[40] = + extern const Word16 ph_imp_mid_MR795[]; + const Word16 ph_imp_mid_MR795[40] = { 30274, 3831, -4036, 2972, -1048, -1002, 2477, -3043, 2815, -2231, 1753, -1611, 1714, -1775, 1543, -1008, 429, -169, 472, -1264, @@ -96,14 +98,16 @@ extern "C" -2063, 2644, -3060, 2897, -1978, 557, 780, -1369, 842, 655 }; - extern const Word16 ph_imp_low[40] = + extern const Word16 ph_imp_low[]; + const Word16 ph_imp_low[40] = { 14690, 11518, 1268, -2761, -5671, 7514, -35, -2807, -3040, 4823, 2952, -8424, 3785, 1455, 2179, -8637, 8051, -2103, -1454, 777, 1108, -2385, 2254, -363, -674, -2103, 6046, -5681, 1072, 3123, -5058, 5312, -2329, -3728, 6924, -3889, 675, -1775, 29, 10145 }; - extern const Word16 ph_imp_mid[40] = + extern const Word16 ph_imp_mid[]; + const Word16 ph_imp_mid[40] = { 30274, 3831, -4036, 2972, -1048, -1002, 2477, -3043, 2815, -2231, 1753, -1611, 1714, -1775, 1543, -1008, 429, -169, 472, -1264, diff --git a/media/libstagefright/codecs/amrnb/common/src/pow2_tbl.cpp b/media/libstagefright/codecs/amrnb/common/src/pow2_tbl.cpp index e0183a6..902ea0f 100644 --- a/media/libstagefright/codecs/amrnb/common/src/pow2_tbl.cpp +++ b/media/libstagefright/codecs/amrnb/common/src/pow2_tbl.cpp @@ -53,6 +53,7 @@ terms listed above has been obtained from the copyright holder. ; INCLUDES ----------------------------------------------------------------------------*/ #include "typedef.h" +#include "pow2.h" /*--------------------------------------------------------------------------*/ #ifdef __cplusplus @@ -81,7 +82,7 @@ extern "C" ; [Variable declaration - defined here and used outside this module] ----------------------------------------------------------------------------*/ - extern const Word16 pow2_tbl[33] = + const Word16 pow2_tbl[33] = { 16384, 16743, 17109, 17484, 17867, 18258, 18658, 19066, 19484, 19911, 20347, 20792, 21247, 21713, 22188, 22674, 23170, 23678, 24196, 24726, diff --git a/media/libstagefright/codecs/amrnb/common/src/q_plsf_5_tbl.cpp b/media/libstagefright/codecs/amrnb/common/src/q_plsf_5_tbl.cpp index ceb1e1e..caa81cb 100644 --- a/media/libstagefright/codecs/amrnb/common/src/q_plsf_5_tbl.cpp +++ b/media/libstagefright/codecs/amrnb/common/src/q_plsf_5_tbl.cpp @@ -56,6 +56,7 @@ terms listed above has been obtained from the copyright holder. ; INCLUDES ----------------------------------------------------------------------------*/ #include "typedef.h" +#include "q_plsf_5_tbl.h" /*--------------------------------------------------------------------------*/ #ifdef __cplusplus @@ -94,7 +95,7 @@ extern "C" ----------------------------------------------------------------------------*/ /* LSF means ->normalize frequency domain */ - extern const Word16 mean_lsf_5[10] = + const Word16 mean_lsf_5[10] = { 1384, 2077, @@ -108,7 +109,7 @@ extern "C" 13701 }; - extern const Word16 dico1_lsf_5[DICO1_5_SIZE * 4] = + const Word16 dico1_lsf_5[DICO1_5_SIZE * 4] = { -451, -1065, -529, -1305, -450, -756, -497, -863, @@ -240,7 +241,7 @@ extern "C" 1469, 2181, 1443, 2016 }; - extern const Word16 dico2_lsf_5[DICO2_5_SIZE * 4] = + const Word16 dico2_lsf_5[DICO2_5_SIZE * 4] = { -1631, -1600, -1796, -2290, -1027, -1770, -1100, -2025, @@ -500,7 +501,7 @@ extern "C" 2374, 2787, 1821, 2788 }; - extern const Word16 dico3_lsf_5[DICO3_5_SIZE * 4] = + const Word16 dico3_lsf_5[DICO3_5_SIZE * 4] = { -1812, -2275, -1879, -2537, -1640, -1848, -1695, -2004, @@ -760,7 +761,7 @@ extern "C" 2180, 1975, 2326, 2020 }; - extern const Word16 dico4_lsf_5[DICO4_5_SIZE * 4] = + const Word16 dico4_lsf_5[DICO4_5_SIZE * 4] = { -1857, -1681, -1857, -1755, -2056, -1150, -2134, -1654, @@ -1020,7 +1021,7 @@ extern "C" 1716, 1376, 1948, 1465 }; - extern const Word16 dico5_lsf_5[DICO5_5_SIZE * 4] = + const Word16 dico5_lsf_5[DICO5_5_SIZE * 4] = { -1002, -929, -1096, -1203, -641, -931, -604, -961, diff --git a/media/libstagefright/codecs/amrnb/common/src/qua_gain_tbl.cpp b/media/libstagefright/codecs/amrnb/common/src/qua_gain_tbl.cpp index 52f77e9..2d913b8 100644 --- a/media/libstagefright/codecs/amrnb/common/src/qua_gain_tbl.cpp +++ b/media/libstagefright/codecs/amrnb/common/src/qua_gain_tbl.cpp @@ -54,6 +54,7 @@ terms listed above has been obtained from the copyright holder. ----------------------------------------------------------------------------*/ #include "typedef.h" #include "qua_gain.h" +#include "qua_gain_tbl.h" /*--------------------------------------------------------------------------*/ #ifdef __cplusplus @@ -96,7 +97,7 @@ extern "C" /* table used in 'high' rates: MR67 MR74 */ - extern const Word16 table_gain_highrates[VQ_SIZE_HIGHRATES*4] = + const Word16 table_gain_highrates[VQ_SIZE_HIGHRATES*4] = { /* @@ -240,7 +241,7 @@ extern "C" /* table used in 'low' rates: MR475, MR515, MR59 */ - extern const Word16 table_gain_lowrates[VQ_SIZE_LOWRATES*4] = + const Word16 table_gain_lowrates[VQ_SIZE_LOWRATES*4] = { /*g_pit, g_fac, qua_ener_MR122, qua_ener */ 10813, 28753, 2879, 17333, diff --git a/media/libstagefright/codecs/amrnb/common/src/sqrt_l_tbl.cpp b/media/libstagefright/codecs/amrnb/common/src/sqrt_l_tbl.cpp index 5e9898c..5a84b63 100644 --- a/media/libstagefright/codecs/amrnb/common/src/sqrt_l_tbl.cpp +++ b/media/libstagefright/codecs/amrnb/common/src/sqrt_l_tbl.cpp @@ -58,6 +58,7 @@ terms listed above has been obtained from the copyright holder. ; INCLUDES ----------------------------------------------------------------------------*/ #include "typedef.h" +#include "sqrt_l.h" /*--------------------------------------------------------------------------*/ #ifdef __cplusplus @@ -85,7 +86,7 @@ extern "C" ; LOCAL VARIABLE DEFINITIONS ; [Variable declaration - defined here and used outside this module] ----------------------------------------------------------------------------*/ - extern const Word16 sqrt_l_tbl[50] = + const Word16 sqrt_l_tbl[50] = { 16384, 16888, 17378, 17854, 18318, 18770, 19212, 19644, 20066, 20480, 20886, 21283, 21674, 22058, 22435, 22806, 23170, 23530, 23884, 24232, diff --git a/media/libstagefright/codecs/amrnb/common/src/window_tab.cpp b/media/libstagefright/codecs/amrnb/common/src/window_tab.cpp index fa5faa6..d8fc8cc 100644 --- a/media/libstagefright/codecs/amrnb/common/src/window_tab.cpp +++ b/media/libstagefright/codecs/amrnb/common/src/window_tab.cpp @@ -117,6 +117,7 @@ terms listed above has been obtained from the copyright holder. ----------------------------------------------------------------------------*/ #include "typedef.h" #include "cnst.h" +#include "window_tab.h" /*--------------------------------------------------------------------------*/ #ifdef __cplusplus @@ -154,7 +155,7 @@ extern "C" /* window for non-EFR modesm; uses 40 samples lookahead */ - extern const Word16 window_200_40[L_WINDOW] = + const Word16 window_200_40[L_WINDOW] = { 2621, 2623, 2629, 2638, 2651, 2668, 2689, 2713, 2741, 2772, 2808, 2847, 2890, 2936, 2986, 3040, 3097, 3158, 3223, 3291, @@ -185,7 +186,7 @@ extern "C" /* window for EFR, first two subframes, no lookahead */ - extern const Word16 window_160_80[L_WINDOW] = + const Word16 window_160_80[L_WINDOW] = { 2621, 2624, 2633, 2648, 2668, 2695, 2727, 2765, 2809, 2859, 2915, 2976, 3043, 3116, 3194, 3279, 3368, 3464, 3565, 3671, @@ -215,7 +216,7 @@ extern "C" /* window for EFR, last two subframes, no lookahead */ - extern const Word16 window_232_8[L_WINDOW] = + const Word16 window_232_8[L_WINDOW] = { 2621, 2623, 2627, 2634, 2644, 2656, 2671, 2689, 2710, 2734, 2760, 2789, 2821, 2855, 2893, 2933, 2975, 3021, 3069, 3120, diff --git a/media/libstagefright/codecs/amrnb/dec/src/dec_input_format_tab.cpp b/media/libstagefright/codecs/amrnb/dec/src/dec_input_format_tab.cpp index a59f5fa..fffbbfd 100644 --- a/media/libstagefright/codecs/amrnb/dec/src/dec_input_format_tab.cpp +++ b/media/libstagefright/codecs/amrnb/dec/src/dec_input_format_tab.cpp @@ -121,6 +121,7 @@ terms listed above has been obtained from the copyright holder. ; INCLUDES ----------------------------------------------------------------------------*/ #include "typedef.h" +#include "amrdecode.h" /*--------------------------------------------------------------------------*/ #ifdef __cplusplus @@ -152,7 +153,7 @@ extern "C" ----------------------------------------------------------------------------*/ /* Table containing the number of core AMR data bytes for */ /* each codec mode for WMF input format(number excludes frame type byte) */ - extern const Word16 WmfDecBytesPerFrame[16] = + const Word16 WmfDecBytesPerFrame[16] = { 12, /* 4.75 */ 13, /* 5.15 */ @@ -174,7 +175,7 @@ extern "C" /* Table containing the number of core AMR data bytes for */ /* each codec mode for IF2 input format. */ - extern const Word16 If2DecBytesPerFrame[16] = + const Word16 If2DecBytesPerFrame[16] = { 13, /* 4.75 */ 14, /* 5.15 */ diff --git a/media/libstagefright/codecs/amrnb/dec/src/qgain475_tab.cpp b/media/libstagefright/codecs/amrnb/dec/src/qgain475_tab.cpp index fbcd412..1a08efa 100644 --- a/media/libstagefright/codecs/amrnb/dec/src/qgain475_tab.cpp +++ b/media/libstagefright/codecs/amrnb/dec/src/qgain475_tab.cpp @@ -92,7 +92,7 @@ extern "C" * g_fac(2) (Q12) // frame 1 and 3 * */ - extern const Word16 table_gain_MR475[MR475_VQ_SIZE*4] = + const Word16 table_gain_MR475[MR475_VQ_SIZE*4] = { /*g_pit(0), g_fac(0), g_pit(1), g_fac(1) */ 812, 128, 542, 140, diff --git a/media/libstagefright/codecs/amrnb/enc/src/corrwght_tab.cpp b/media/libstagefright/codecs/amrnb/enc/src/corrwght_tab.cpp index 769e7ba..b3ed02d 100644 --- a/media/libstagefright/codecs/amrnb/enc/src/corrwght_tab.cpp +++ b/media/libstagefright/codecs/amrnb/enc/src/corrwght_tab.cpp @@ -57,6 +57,7 @@ terms listed above has been obtained from the copyright holder. ; INCLUDES ----------------------------------------------------------------------------*/ #include "typedef.h" +#include "p_ol_wgh.h" /*--------------------------------------------------------------------------*/ #ifdef __cplusplus @@ -84,7 +85,7 @@ extern "C" ; LOCAL VARIABLE DEFINITIONS ; [Variable declaration - defined here and used outside this module] ----------------------------------------------------------------------------*/ - extern const Word16 corrweight[251] = + const Word16 corrweight[251] = { 20473, 20506, 20539, 20572, 20605, 20644, 20677, 20716, 20749, 20788, 20821, 20860, 20893, 20932, diff --git a/media/libstagefright/codecs/amrnb/enc/src/enc_output_format_tab.cpp b/media/libstagefright/codecs/amrnb/enc/src/enc_output_format_tab.cpp index 147989f..4551fd7 100644 --- a/media/libstagefright/codecs/amrnb/enc/src/enc_output_format_tab.cpp +++ b/media/libstagefright/codecs/amrnb/enc/src/enc_output_format_tab.cpp @@ -117,6 +117,7 @@ terms listed above has been obtained from the copyright holder. ; INCLUDES ----------------------------------------------------------------------------*/ #include "typedef.h" +#include "amrencode.h" /*--------------------------------------------------------------------------*/ #ifdef __cplusplus @@ -150,7 +151,7 @@ extern "C" /* for WMF output format. */ /* Each entry is the sum of the 3GPP frame type byte and the */ /* number of packed core AMR data bytes */ - extern const Word16 WmfEncBytesPerFrame[16] = + const Word16 WmfEncBytesPerFrame[16] = { 13, /* 4.75 */ 14, /* 5.15 */ @@ -173,7 +174,7 @@ extern "C" /* Number of data bytes in an encoder frame for each codec mode */ /* for IF2 output format */ - extern const Word16 If2EncBytesPerFrame[16] = + const Word16 If2EncBytesPerFrame[16] = { 13, /* 4.75 */ 14, /* 5.15 */ diff --git a/media/libstagefright/codecs/amrnb/enc/src/inter_36_tab.cpp b/media/libstagefright/codecs/amrnb/enc/src/inter_36_tab.cpp index 27f33e9..c8d7b13 100644 --- a/media/libstagefright/codecs/amrnb/enc/src/inter_36_tab.cpp +++ b/media/libstagefright/codecs/amrnb/enc/src/inter_36_tab.cpp @@ -123,6 +123,7 @@ terms listed above has been obtained from the copyright holder. ----------------------------------------------------------------------------*/ #include "typedef.h" #include "cnst.h" +#include "inter_36_tab.h" /*--------------------------------------------------------------------------*/ #ifdef __cplusplus @@ -162,7 +163,7 @@ extern "C" inter_3[k] = inter_6[2*k], 0 <= k <= 3*L_INTER_SRCH */ - extern const Word16 inter_6[FIR_SIZE] = + const Word16 inter_6[FIR_SIZE] = { 29519, 28316, 24906, 19838, 13896, 7945, 2755, diff --git a/media/libstagefright/codecs/amrnb/enc/src/lag_wind_tab.cpp b/media/libstagefright/codecs/amrnb/enc/src/lag_wind_tab.cpp index 53889bb..b0f5b3a 100644 --- a/media/libstagefright/codecs/amrnb/enc/src/lag_wind_tab.cpp +++ b/media/libstagefright/codecs/amrnb/enc/src/lag_wind_tab.cpp @@ -138,6 +138,7 @@ terms listed above has been obtained from the copyright holder. ; INCLUDES ----------------------------------------------------------------------------*/ #include "typedef.h" +#include "lag_wind_tab.h" /*--------------------------------------------------------------------------*/ #ifdef __cplusplus @@ -167,7 +168,7 @@ extern "C" ; LOCAL STORE/BUFFER/POINTER DEFINITIONS ; Variable declaration - defined here and used outside this module ----------------------------------------------------------------------------*/ - extern const Word16 lag_h[10] = + const Word16 lag_h[10] = { 32728, 32619, @@ -181,7 +182,7 @@ extern "C" 29321 }; - extern const Word16 lag_l[10] = + const Word16 lag_l[10] = { 11904, 17280, |