Reland "Upconvert various types to int.", ilbc portion.
This reverts portions of commit cb180976dd0e9672cde4523d87b5f4857478b5e9, which reverted commit 83ad33a8aed1fb00e422b6abd33c3e8942821c24. Specifically, the files in webrtc/modules/audio_coding/codecs/ilbc/ are relanded. The original commit message is below: Upconvert various types to int. Per comments from HL/kwiberg on https://webrtc-codereview.appspot.com/42569004 , when there is existing usage of mixed types (int16_t, int, etc.), we'd prefer to standardize on larger types like int and phase out use of int16_t. Specifically, "Using int16 just because we're sure all reasonable values will fit in 16 bits isn't usually meaningful in C." This converts some existing uses of int16_t (and, in a few cases, other types such as uint16_t) to int (or, in a few places, int32_t). Other locations will be converted to size_t in a separate change. BUG=none TBR=kwiberg Review URL: https://codereview.webrtc.org/1184643002 Cr-Commit-Position: refs/heads/master@{#9423}
This commit is contained in:
@ -41,7 +41,8 @@ int main(int argc, char* argv[])
|
||||
{
|
||||
FILE *ifileid,*efileid,*ofileid, *chfileid;
|
||||
short encoded_data[55], data[240], speechType;
|
||||
short len, mode, pli;
|
||||
int len;
|
||||
short mode, pli;
|
||||
size_t readlen;
|
||||
int blockcount = 0;
|
||||
|
||||
@ -173,7 +174,7 @@ int main(int argc, char* argv[])
|
||||
/* decoding */
|
||||
fprintf(stderr, "--- Decoding block %i --- ",blockcount);
|
||||
if (pli==1) {
|
||||
len=WebRtcIlbcfix_Decode(Dec_Inst, encoded_data, len, data,
|
||||
len=WebRtcIlbcfix_Decode(Dec_Inst, encoded_data, (int16_t)len, data,
|
||||
&speechType);
|
||||
if (len < 0) {
|
||||
fprintf(stderr, "Error decoding\n");
|
||||
|
||||
Reference in New Issue
Block a user