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

Unified Diff: webrtc/modules/audio_coding/codecs/isac/main/test/SwitchingSampRate/SwitchingSampRate.cc

Issue 1230503003: Update a ton of audio code to use size_t more correctly and in general reduce (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Resync 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/isac/main/test/SwitchingSampRate/SwitchingSampRate.cc
diff --git a/webrtc/modules/audio_coding/codecs/isac/main/test/SwitchingSampRate/SwitchingSampRate.cc b/webrtc/modules/audio_coding/codecs/isac/main/test/SwitchingSampRate/SwitchingSampRate.cc
index a11e408b3b15e4508720e64056944eadff9b88f1..08061ac532997ce3fb2e3ac5b9dd79ad18787f4b 100644
--- a/webrtc/modules/audio_coding/codecs/isac/main/test/SwitchingSampRate/SwitchingSampRate.cc
+++ b/webrtc/modules/audio_coding/codecs/isac/main/test/SwitchingSampRate/SwitchingSampRate.cc
@@ -51,9 +51,9 @@ int main(int argc, char* argv[])
short clientCntr;
- unsigned int lenEncodedInBytes[MAX_NUM_CLIENTS];
+ size_t lenEncodedInBytes[MAX_NUM_CLIENTS];
unsigned int lenAudioIn10ms[MAX_NUM_CLIENTS];
- unsigned int lenEncodedInBytesTmp[MAX_NUM_CLIENTS];
+ size_t lenEncodedInBytesTmp[MAX_NUM_CLIENTS];
unsigned int lenAudioIn10msTmp[MAX_NUM_CLIENTS];
BottleNeckModel* packetData[MAX_NUM_CLIENTS];
@@ -189,9 +189,9 @@ int main(int argc, char* argv[])
}
- short streamLen;
+ size_t streamLen;
short numSamplesRead;
- int lenDecodedAudio;
+ size_t lenDecodedAudio;
short senderIdx;
short receiverIdx;
@@ -282,11 +282,11 @@ int main(int argc, char* argv[])
// Encode
- streamLen = WebRtcIsac_Encode(codecInstance[senderIdx],
- audioBuff10ms,
- (uint8_t*)bitStream);
+ int streamLen_int = WebRtcIsac_Encode(codecInstance[senderIdx],
+ audioBuff10ms,
+ (uint8_t*)bitStream);
int16_t ggg;
- if (streamLen > 0) {
+ if (streamLen_int > 0) {
if ((WebRtcIsac_ReadFrameLen(
codecInstance[receiverIdx],
reinterpret_cast<const uint8_t*>(bitStream),
@@ -295,11 +295,12 @@ int main(int argc, char* argv[])
}
// Sanity check
- if(streamLen < 0)
+ if(streamLen_int < 0)
{
printf(" Encoder error in client %d \n", senderIdx + 1);
return -1;
}
+ streamLen = static_cast<size_t>(streamLen_int);
if(streamLen > 0)
@@ -423,18 +424,18 @@ int main(int argc, char* argv[])
}
/**/
// Decode
- lenDecodedAudio = WebRtcIsac_Decode(
+ int lenDecodedAudio_int = WebRtcIsac_Decode(
codecInstance[receiverIdx],
reinterpret_cast<const uint8_t*>(bitStream),
streamLen,
audioBuff60ms,
speechType);
- if(lenDecodedAudio < 0)
+ if(lenDecodedAudio_int < 0)
{
printf(" Decoder error in client %d \n", receiverIdx + 1);
return -1;
}
-
+ lenDecodedAudio = static_cast<size_t>(lenDecodedAudio_int);
if(encoderSampRate[senderIdx] == 16000)
{
@@ -442,7 +443,7 @@ int main(int argc, char* argv[])
resamplerState[receiverIdx]);
if (fwrite(resampledAudio60ms, sizeof(short), lenDecodedAudio << 1,
outFile[receiverIdx]) !=
- static_cast<size_t>(lenDecodedAudio << 1)) {
+ lenDecodedAudio << 1) {
return -1;
}
}
@@ -450,7 +451,7 @@ int main(int argc, char* argv[])
{
if (fwrite(audioBuff60ms, sizeof(short), lenDecodedAudio,
outFile[receiverIdx]) !=
- static_cast<size_t>(lenDecodedAudio)) {
+ lenDecodedAudio) {
return -1;
}
}

Powered by Google App Engine
This is Rietveld 408576698