Index: webrtc/modules/audio_processing/audio_buffer.cc |
diff --git a/webrtc/modules/audio_processing/audio_buffer.cc b/webrtc/modules/audio_processing/audio_buffer.cc |
index 04dcaea799d60af6bbc48d899e9ded8134d6ce03..5e07b661655bbfae3b3ae1940be816700b434063 100644 |
--- a/webrtc/modules/audio_processing/audio_buffer.cc |
+++ b/webrtc/modules/audio_processing/audio_buffer.cc |
@@ -19,9 +19,9 @@ |
namespace webrtc { |
namespace { |
-const int kSamplesPer16kHzChannel = 160; |
-const int kSamplesPer32kHzChannel = 320; |
-const int kSamplesPer48kHzChannel = 480; |
+const size_t kSamplesPer16kHzChannel = 160; |
+const size_t kSamplesPer32kHzChannel = 320; |
+const size_t kSamplesPer48kHzChannel = 480; |
bool HasKeyboardChannel(AudioProcessing::ChannelLayout layout) { |
switch (layout) { |
@@ -53,28 +53,27 @@ int KeyboardChannelIndex(AudioProcessing::ChannelLayout layout) { |
template <typename T> |
void StereoToMono(const T* left, const T* right, T* out, |
- int num_frames) { |
- for (int i = 0; i < num_frames; ++i) |
+ size_t num_frames) { |
+ for (size_t i = 0; i < num_frames; ++i) |
out[i] = (left[i] + right[i]) / 2; |
} |
-int NumBandsFromSamplesPerChannel(int num_frames) { |
- int num_bands = 1; |
+size_t NumBandsFromSamplesPerChannel(size_t num_frames) { |
+ size_t num_bands = 1; |
if (num_frames == kSamplesPer32kHzChannel || |
num_frames == kSamplesPer48kHzChannel) { |
- num_bands = rtc::CheckedDivExact(num_frames, |
- static_cast<int>(kSamplesPer16kHzChannel)); |
+ num_bands = rtc::CheckedDivExact(num_frames, kSamplesPer16kHzChannel); |
} |
return num_bands; |
} |
} // namespace |
-AudioBuffer::AudioBuffer(int input_num_frames, |
+AudioBuffer::AudioBuffer(size_t input_num_frames, |
int num_input_channels, |
- int process_num_frames, |
+ size_t process_num_frames, |
int num_process_channels, |
- int output_num_frames) |
+ size_t output_num_frames) |
: input_num_frames_(input_num_frames), |
num_input_channels_(num_input_channels), |
proc_num_frames_(process_num_frames), |
@@ -130,7 +129,7 @@ AudioBuffer::AudioBuffer(int input_num_frames, |
AudioBuffer::~AudioBuffer() {} |
void AudioBuffer::CopyFrom(const float* const* data, |
- int num_frames, |
+ size_t num_frames, |
AudioProcessing::ChannelLayout layout) { |
assert(num_frames == input_num_frames_); |
assert(ChannelsFromLayout(layout) == num_input_channels_); |
@@ -175,7 +174,7 @@ void AudioBuffer::CopyFrom(const float* const* data, |
} |
} |
-void AudioBuffer::CopyTo(int num_frames, |
+void AudioBuffer::CopyTo(size_t num_frames, |
AudioProcessing::ChannelLayout layout, |
float* const* data) { |
assert(num_frames == output_num_frames_); |
@@ -376,20 +375,20 @@ void AudioBuffer::set_num_channels(int num_channels) { |
num_channels_ = num_channels; |
} |
-int AudioBuffer::num_frames() const { |
+size_t AudioBuffer::num_frames() const { |
return proc_num_frames_; |
} |
-int AudioBuffer::num_frames_per_band() const { |
+size_t AudioBuffer::num_frames_per_band() const { |
return num_split_frames_; |
} |
-int AudioBuffer::num_keyboard_frames() const { |
+size_t AudioBuffer::num_keyboard_frames() const { |
// We don't resample the keyboard channel. |
return input_num_frames_; |
} |
-int AudioBuffer::num_bands() const { |
+size_t AudioBuffer::num_bands() const { |
return num_bands_; |
} |
@@ -413,7 +412,7 @@ void AudioBuffer::DeinterleaveFrom(AudioFrame* frame) { |
} |
if (num_input_channels_ == 2 && num_proc_channels_ == 1) { |
// Downmix directly; no explicit deinterleaving needed. |
- for (int i = 0; i < input_num_frames_; ++i) { |
+ for (size_t i = 0; i < input_num_frames_; ++i) { |
deinterleaved[0][i] = (frame->data_[i * 2] + frame->data_[i * 2 + 1]) / 2; |
} |
} else { |