Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2125)

Unified Diff: webrtc/modules/audio_coding/codecs/ilbc/ilbc.c

Issue 1230693002: Update audio code to use size_t more correctly, (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Review comments Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/modules/audio_coding/codecs/ilbc/ilbc.c
diff --git a/webrtc/modules/audio_coding/codecs/ilbc/ilbc.c b/webrtc/modules/audio_coding/codecs/ilbc/ilbc.c
index e41c095f82ead8a27b66be54251150500c5c5f18..c565a246dbc5cebc291abfe0b90e124536b473c3 100644
--- a/webrtc/modules/audio_coding/codecs/ilbc/ilbc.c
+++ b/webrtc/modules/audio_coding/codecs/ilbc/ilbc.c
@@ -90,10 +90,10 @@ int16_t WebRtcIlbcfix_EncoderInit(IlbcEncoderInstance* iLBCenc_inst,
int WebRtcIlbcfix_Encode(IlbcEncoderInstance* iLBCenc_inst,
const int16_t* speechIn,
- int16_t len,
+ size_t len,
uint8_t* encoded) {
- int16_t pos = 0;
- int16_t encpos = 0;
+ size_t pos = 0;
+ size_t encpos = 0;
if ((len != ((IlbcEncoder*)iLBCenc_inst)->blockl) &&
#ifdef SPLIT_10MS
@@ -118,7 +118,7 @@ int WebRtcIlbcfix_Encode(IlbcEncoderInstance* iLBCenc_inst,
#endif
encpos += ((IlbcEncoder*)iLBCenc_inst)->no_of_words;
}
- return (encpos*2);
+ return (int)(encpos*2);
}
}
@@ -143,11 +143,11 @@ int16_t WebRtcIlbcfix_Decoderinit30Ms(IlbcDecoderInstance *iLBCdec_inst) {
int WebRtcIlbcfix_Decode(IlbcDecoderInstance* iLBCdec_inst,
const uint8_t* encoded,
- int16_t len,
+ size_t len,
int16_t* decoded,
int16_t* speechType)
{
- int i=0;
+ size_t i=0;
/* Allow for automatic switching between the frame sizes
(although you do get some discontinuity) */
if ((len==((IlbcDecoder*)iLBCdec_inst)->no_of_bytes)||
@@ -191,16 +191,16 @@ int WebRtcIlbcfix_Decode(IlbcDecoderInstance* iLBCdec_inst,
}
/* iLBC does not support VAD/CNG yet */
*speechType=1;
- return(i*((IlbcDecoder*)iLBCdec_inst)->blockl);
+ return (int)(i*((IlbcDecoder*)iLBCdec_inst)->blockl);
}
int WebRtcIlbcfix_Decode20Ms(IlbcDecoderInstance* iLBCdec_inst,
const uint8_t* encoded,
- int16_t len,
+ size_t len,
int16_t* decoded,
int16_t* speechType)
{
- int i=0;
+ size_t i=0;
if ((len==((IlbcDecoder*)iLBCdec_inst)->no_of_bytes)||
(len==2*((IlbcDecoder*)iLBCdec_inst)->no_of_bytes)||
(len==3*((IlbcDecoder*)iLBCdec_inst)->no_of_bytes)) {
@@ -219,16 +219,16 @@ int WebRtcIlbcfix_Decode20Ms(IlbcDecoderInstance* iLBCdec_inst,
}
/* iLBC does not support VAD/CNG yet */
*speechType=1;
- return(i*((IlbcDecoder*)iLBCdec_inst)->blockl);
+ return (int)(i*((IlbcDecoder*)iLBCdec_inst)->blockl);
}
int WebRtcIlbcfix_Decode30Ms(IlbcDecoderInstance* iLBCdec_inst,
const uint8_t* encoded,
- int16_t len,
+ size_t len,
int16_t* decoded,
int16_t* speechType)
{
- int i=0;
+ size_t i=0;
if ((len==((IlbcDecoder*)iLBCdec_inst)->no_of_bytes)||
(len==2*((IlbcDecoder*)iLBCdec_inst)->no_of_bytes)||
(len==3*((IlbcDecoder*)iLBCdec_inst)->no_of_bytes)) {
@@ -247,13 +247,13 @@ int WebRtcIlbcfix_Decode30Ms(IlbcDecoderInstance* iLBCdec_inst,
}
/* iLBC does not support VAD/CNG yet */
*speechType=1;
- return(i*((IlbcDecoder*)iLBCdec_inst)->blockl);
+ return (int)(i*((IlbcDecoder*)iLBCdec_inst)->blockl);
}
-int16_t WebRtcIlbcfix_DecodePlc(IlbcDecoderInstance* iLBCdec_inst,
- int16_t* decoded,
- int16_t noOfLostFrames) {
- int i;
+size_t WebRtcIlbcfix_DecodePlc(IlbcDecoderInstance* iLBCdec_inst,
+ int16_t* decoded,
+ size_t noOfLostFrames) {
+ size_t i;
uint16_t dummy;
for (i=0;i<noOfLostFrames;i++) {
@@ -265,9 +265,9 @@ int16_t WebRtcIlbcfix_DecodePlc(IlbcDecoderInstance* iLBCdec_inst,
return (noOfLostFrames*((IlbcDecoder*)iLBCdec_inst)->blockl);
}
-int16_t WebRtcIlbcfix_NetEqPlc(IlbcDecoderInstance* iLBCdec_inst,
- int16_t* decoded,
- int16_t noOfLostFrames) {
+size_t WebRtcIlbcfix_NetEqPlc(IlbcDecoderInstance* iLBCdec_inst,
+ int16_t* decoded,
+ size_t noOfLostFrames) {
/* Two input parameters not used, but needed for function pointers in NetEQ */
(void)(decoded = NULL);
(void)(noOfLostFrames = 0);
« no previous file with comments | « webrtc/modules/audio_coding/codecs/ilbc/hp_output.c ('k') | webrtc/modules/audio_coding/codecs/ilbc/init_decode.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698