generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

WebRtc_Word32 => int32_t etc. in audio_coding/

Browse Source 
BUG=314

Review URL: https://webrtc-codereview.appspot.com/1271006

git-svn-id: http://webrtc.googlecode.com/svn/trunk@3789 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
pbos@webrtc.org
2013-04-09 00:28:06 +00:00
parent 6faf71d27b
commit 0946a56023
382 changed files with 8469 additions and 8488 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
webrtc/modules/audio_coding/codecs/ilbc/test/iLBC_test.c
View File

@@ -44,14 +44,14 @@ int main(int argc, char* argv[])
{
FILE *ifileid,*efileid,*ofileid, *cfileid;
WebRtc_Word16 data[BLOCKL_MAX];
WebRtc_Word16 encoded_data[ILBCNOOFWORDS_MAX], decoded_data[BLOCKL_MAX];
int16_t data[BLOCKL_MAX];
int16_t encoded_data[ILBCNOOFWORDS_MAX], decoded_data[BLOCKL_MAX];
int len;
short pli, mode;
int blockcount = 0;
int packetlosscount = 0;
int frameLen;
WebRtc_Word16 speechType;
int16_t speechType;
iLBC_encinst_t *Enc_Inst;
iLBC_decinst_t *Dec_Inst;
@@ -155,7 +155,7 @@ int main(int argc, char* argv[])
/* loop over input blocks */
while (((WebRtc_Word16)fread(data,sizeof(WebRtc_Word16),frameLen,ifileid))==
while (((int16_t)fread(data,sizeof(int16_t),frameLen,ifileid))==
frameLen) {
blockcount++;
@@ -163,20 +163,20 @@ int main(int argc, char* argv[])
/* encoding */
fprintf(stderr, "--- Encoding block %i --- ",blockcount);
len=WebRtcIlbcfix_Encode(Enc_Inst, data, (WebRtc_Word16)frameLen, encoded_data);
len=WebRtcIlbcfix_Encode(Enc_Inst, data, (int16_t)frameLen, encoded_data);
fprintf(stderr, "\r");
/* write byte file */
if (fwrite(encoded_data, sizeof(WebRtc_Word16),
((len+1)/sizeof(WebRtc_Word16)), efileid) !=
(size_t)(((len+1)/sizeof(WebRtc_Word16)))) {
if (fwrite(encoded_data, sizeof(int16_t),
((len+1)/sizeof(int16_t)), efileid) !=
(size_t)(((len+1)/sizeof(int16_t)))) {
return -1;
}
/* get channel data if provided */
if (argc==6) {
if (fread(&pli, sizeof(WebRtc_Word16), 1, cfileid)) {
if (fread(&pli, sizeof(int16_t), 1, cfileid)) {
if ((pli!=0)&&(pli!=1)) {
fprintf(stderr, "Error in channel file\n");
exit(0);
@@ -184,7 +184,7 @@ int main(int argc, char* argv[])
if (pli==0) {
/* Packet loss -> remove info from frame */
memset(encoded_data, 0,
sizeof(WebRtc_Word16)*ILBCNOOFWORDS_MAX);
sizeof(int16_t)*ILBCNOOFWORDS_MAX);
packetlosscount++;
}
} else {
@@ -200,7 +200,7 @@ int main(int argc, char* argv[])
fprintf(stderr, "--- Decoding block %i --- ",blockcount);
if (pli==1) {
len=WebRtcIlbcfix_Decode(Dec_Inst, encoded_data,
(WebRtc_Word16)len, decoded_data,&speechType);
(int16_t)len, decoded_data,&speechType);
} else {
len=WebRtcIlbcfix_DecodePlc(Dec_Inst, decoded_data, 1);
}
@@ -208,7 +208,7 @@ int main(int argc, char* argv[])
/* write output file */
if (fwrite(decoded_data, sizeof(WebRtc_Word16), len,
if (fwrite(decoded_data, sizeof(int16_t), len,
ofileid) != (size_t)len) {
return -1;
}