| Index: webrtc/common_audio/include/audio_util.h
|
| diff --git a/webrtc/common_audio/include/audio_util.h b/webrtc/common_audio/include/audio_util.h
|
| index 8262649145546180f23b6e82094d324b7f604e7f..fedaaa23638dad36eaaee521641ae63e0aef2d00 100644
|
| --- a/webrtc/common_audio/include/audio_util.h
|
| +++ b/webrtc/common_audio/include/audio_util.h
|
| @@ -69,12 +69,12 @@ void FloatS16ToFloat(const float* src, size_t size, float* dest);
|
| // |deinterleaved| buffers (|num_channel| buffers with |samples_per_channel|
|
| // per buffer).
|
| template <typename T>
|
| -void Deinterleave(const T* interleaved, int samples_per_channel,
|
| +void Deinterleave(const T* interleaved, size_t samples_per_channel,
|
| int num_channels, T* const* deinterleaved) {
|
| for (int i = 0; i < num_channels; ++i) {
|
| T* channel = deinterleaved[i];
|
| int interleaved_idx = i;
|
| - for (int j = 0; j < samples_per_channel; ++j) {
|
| + for (size_t j = 0; j < samples_per_channel; ++j) {
|
| channel[j] = interleaved[interleaved_idx];
|
| interleaved_idx += num_channels;
|
| }
|
| @@ -85,12 +85,12 @@ void Deinterleave(const T* interleaved, int samples_per_channel,
|
| // |interleaved|. There must be sufficient space allocated in |interleaved|
|
| // (|samples_per_channel| * |num_channels|).
|
| template <typename T>
|
| -void Interleave(const T* const* deinterleaved, int samples_per_channel,
|
| +void Interleave(const T* const* deinterleaved, size_t samples_per_channel,
|
| int num_channels, T* interleaved) {
|
| for (int i = 0; i < num_channels; ++i) {
|
| const T* channel = deinterleaved[i];
|
| int interleaved_idx = i;
|
| - for (int j = 0; j < samples_per_channel; ++j) {
|
| + for (size_t j = 0; j < samples_per_channel; ++j) {
|
| interleaved[interleaved_idx] = channel[j];
|
| interleaved_idx += num_channels;
|
| }
|
|
|