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

Unified Diff: webrtc/modules/utility/source/file_player_impl.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/utility/source/file_player_impl.cc
diff --git a/webrtc/modules/utility/source/file_player_impl.cc b/webrtc/modules/utility/source/file_player_impl.cc
index df6a5bfbcaf8beed8872124214b392ec9891fb73..8c94caafb59fc9d1378bd91e50addba154738038 100644
--- a/webrtc/modules/utility/source/file_player_impl.cc
+++ b/webrtc/modules/utility/source/file_player_impl.cc
@@ -95,7 +95,7 @@ int32_t FilePlayerImpl::AudioCodec(CodecInst& audioCodec) const
int32_t FilePlayerImpl::Get10msAudioFromFile(
int16_t* outBuffer,
- int& lengthInSamples,
+ size_t& lengthInSamples,
int frequencyInHz)
{
if(_codec.plfreq == 0)
@@ -127,8 +127,7 @@ int32_t FilePlayerImpl::Get10msAudioFromFile(
return 0;
}
// One sample is two bytes.
- unresampledAudioFrame.samples_per_channel_ =
- (uint16_t)lengthInBytes >> 1;
+ unresampledAudioFrame.samples_per_channel_ = lengthInBytes >> 1;
} else {
// Decode will generate 10 ms of audio data. PlayoutAudioData(..)
@@ -156,14 +155,14 @@ int32_t FilePlayerImpl::Get10msAudioFromFile(
}
}
- int outLen = 0;
+ size_t outLen = 0;
if(_resampler.ResetIfNeeded(unresampledAudioFrame.sample_rate_hz_,
frequencyInHz, 1))
{
LOG(LS_WARNING) << "Get10msAudioFromFile() unexpected codec.";
// New sampling frequency. Update state.
- outLen = frequencyInHz / 100;
+ outLen = static_cast<size_t>(frequencyInHz / 100);
memset(outBuffer, 0, outLen * sizeof(int16_t));
return 0;
}
@@ -177,7 +176,7 @@ int32_t FilePlayerImpl::Get10msAudioFromFile(
if(_scaling != 1.0)
{
- for (int i = 0;i < outLen; i++)
+ for (size_t i = 0;i < outLen; i++)
{
outBuffer[i] = (int16_t)(outBuffer[i] * _scaling);
}
« no previous file with comments | « webrtc/modules/utility/source/file_player_impl.h ('k') | webrtc/modules/utility/source/file_player_unittests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698