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

Commit dafebd6b authored by Martin Storsjo's avatar Martin Storsjo
Browse files

stagefright amrnb: Remove extern from table definitions 

Local prototype declarations are added where no suitable ones are
available in headers.

This fixes warnings when compiling as C - while the source
files are named .cpp, they actually are compileable as pure C.

This was committed on the master branch of the opencore
repository in commit a0acb494ea6682ca966b5ebbd3676c89c56d63a6,
based on AOSP contribution 10303.

Change-Id: Ib4e27ea30302c66e0233e63e5a4652f6339bc940
parent 9cb864de

media/libstagefright/codecs/amrnb/common/src/bitno_tab.cpp

+12 −12
Original line number Diff line number Diff line
@@ -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,

media/libstagefright/codecs/amrnb/common/src/bitreorder_tab.cpp

+11 −11
Original line number Diff line number Diff line
@@ -172,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,
@@ -192,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,
@@ -206,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,
@@ -221,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,
@@ -237,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,
@@ -255,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,
@@ -274,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,
@@ -294,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,
@@ -319,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,
@@ -349,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,
@@ -362,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*/

media/libstagefright/codecs/amrnb/common/src/bytesused.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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 */

media/libstagefright/codecs/amrnb/common/src/c2_9pf_tab.cpp

+2 −1
Original line number Diff line number Diff line
@@ -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

media/libstagefright/codecs/amrnb/common/src/gains_tbl.cpp

+4 −2
Original line number Diff line number Diff line
@@ -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: