diff options
| author | Martin Storsjo <martin@martin.st> | 2011-05-18 12:28:33 +0300 |
|---|---|---|
| committer | Martin Storsjo <martin@martin.st> | 2012-02-24 23:07:49 +0200 |
| commit | 1ead790eadd0e09a118308caccc7ac37d36f43f3 (patch) | |
| tree | 0f7847184a1c166a4ce1dfe402e0b50d0386c8f6 /media/libstagefright/codecs/amrnb/enc/src | |
| parent | d95a8462c367a7bea1b4aee24917d3e9ed7e2a48 (diff) | |
| download | frameworks_av-1ead790eadd0e09a118308caccc7ac37d36f43f3.zip frameworks_av-1ead790eadd0e09a118308caccc7ac37d36f43f3.tar.gz frameworks_av-1ead790eadd0e09a118308caccc7ac37d36f43f3.tar.bz2 | |
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
Diffstat (limited to 'media/libstagefright/codecs/amrnb/enc/src')
4 files changed, 6 insertions, 6 deletions
diff --git a/media/libstagefright/codecs/amrnb/enc/src/corrwght_tab.cpp b/media/libstagefright/codecs/amrnb/enc/src/corrwght_tab.cpp index ee1287a..b3ed02d 100644 --- a/media/libstagefright/codecs/amrnb/enc/src/corrwght_tab.cpp +++ b/media/libstagefright/codecs/amrnb/enc/src/corrwght_tab.cpp @@ -85,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 199447f..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 @@ -151,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 */ @@ -174,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 0f882eb..c8d7b13 100644 --- a/media/libstagefright/codecs/amrnb/enc/src/inter_36_tab.cpp +++ b/media/libstagefright/codecs/amrnb/enc/src/inter_36_tab.cpp @@ -163,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 cd00ff6..b0f5b3a 100644 --- a/media/libstagefright/codecs/amrnb/enc/src/lag_wind_tab.cpp +++ b/media/libstagefright/codecs/amrnb/enc/src/lag_wind_tab.cpp @@ -168,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, @@ -182,7 +182,7 @@ extern "C" 29321 }; - extern const Word16 lag_l[10] = + const Word16 lag_l[10] = { 11904, 17280, |