| Index: webrtc/common_audio/audio_converter.cc
|
| diff --git a/webrtc/common_audio/audio_converter.cc b/webrtc/common_audio/audio_converter.cc
|
| index 624c38da38f5f6a726aeab7474e58cf2a91039d5..2b436e8be9da4d5aae148b38fab46bdd8de5b6ac 100644
|
| --- a/webrtc/common_audio/audio_converter.cc
|
| +++ b/webrtc/common_audio/audio_converter.cc
|
| @@ -24,7 +24,7 @@ namespace webrtc {
|
|
|
| class CopyConverter : public AudioConverter {
|
| public:
|
| - CopyConverter(int src_channels, size_t src_frames, int dst_channels,
|
| + CopyConverter(size_t src_channels, size_t src_frames, size_t dst_channels,
|
| size_t dst_frames)
|
| : AudioConverter(src_channels, src_frames, dst_channels, dst_frames) {}
|
| ~CopyConverter() override {};
|
| @@ -33,7 +33,7 @@ class CopyConverter : public AudioConverter {
|
| size_t dst_capacity) override {
|
| CheckSizes(src_size, dst_capacity);
|
| if (src != dst) {
|
| - for (int i = 0; i < src_channels(); ++i)
|
| + for (size_t i = 0; i < src_channels(); ++i)
|
| std::memcpy(dst[i], src[i], dst_frames() * sizeof(*dst[i]));
|
| }
|
| }
|
| @@ -41,7 +41,7 @@ class CopyConverter : public AudioConverter {
|
|
|
| class UpmixConverter : public AudioConverter {
|
| public:
|
| - UpmixConverter(int src_channels, size_t src_frames, int dst_channels,
|
| + UpmixConverter(size_t src_channels, size_t src_frames, size_t dst_channels,
|
| size_t dst_frames)
|
| : AudioConverter(src_channels, src_frames, dst_channels, dst_frames) {}
|
| ~UpmixConverter() override {};
|
| @@ -51,7 +51,7 @@ class UpmixConverter : public AudioConverter {
|
| CheckSizes(src_size, dst_capacity);
|
| for (size_t i = 0; i < dst_frames(); ++i) {
|
| const float value = src[0][i];
|
| - for (int j = 0; j < dst_channels(); ++j)
|
| + for (size_t j = 0; j < dst_channels(); ++j)
|
| dst[j][i] = value;
|
| }
|
| }
|
| @@ -59,7 +59,7 @@ class UpmixConverter : public AudioConverter {
|
|
|
| class DownmixConverter : public AudioConverter {
|
| public:
|
| - DownmixConverter(int src_channels, size_t src_frames, int dst_channels,
|
| + DownmixConverter(size_t src_channels, size_t src_frames, size_t dst_channels,
|
| size_t dst_frames)
|
| : AudioConverter(src_channels, src_frames, dst_channels, dst_frames) {
|
| }
|
| @@ -71,7 +71,7 @@ class DownmixConverter : public AudioConverter {
|
| float* dst_mono = dst[0];
|
| for (size_t i = 0; i < src_frames(); ++i) {
|
| float sum = 0;
|
| - for (int j = 0; j < src_channels(); ++j)
|
| + for (size_t j = 0; j < src_channels(); ++j)
|
| sum += src[j][i];
|
| dst_mono[i] = sum / src_channels();
|
| }
|
| @@ -80,11 +80,11 @@ class DownmixConverter : public AudioConverter {
|
|
|
| class ResampleConverter : public AudioConverter {
|
| public:
|
| - ResampleConverter(int src_channels, size_t src_frames, int dst_channels,
|
| + ResampleConverter(size_t src_channels, size_t src_frames, size_t dst_channels,
|
| size_t dst_frames)
|
| : AudioConverter(src_channels, src_frames, dst_channels, dst_frames) {
|
| resamplers_.reserve(src_channels);
|
| - for (int i = 0; i < src_channels; ++i)
|
| + for (size_t i = 0; i < src_channels; ++i)
|
| resamplers_.push_back(new PushSincResampler(src_frames, dst_frames));
|
| }
|
| ~ResampleConverter() override {};
|
| @@ -135,9 +135,9 @@ class CompositionConverter : public AudioConverter {
|
| ScopedVector<ChannelBuffer<float>> buffers_;
|
| };
|
|
|
| -rtc::scoped_ptr<AudioConverter> AudioConverter::Create(int src_channels,
|
| +rtc::scoped_ptr<AudioConverter> AudioConverter::Create(size_t src_channels,
|
| size_t src_frames,
|
| - int dst_channels,
|
| + size_t dst_channels,
|
| size_t dst_frames) {
|
| rtc::scoped_ptr<AudioConverter> sp;
|
| if (src_channels > dst_channels) {
|
| @@ -182,8 +182,8 @@ AudioConverter::AudioConverter()
|
| dst_channels_(0),
|
| dst_frames_(0) {}
|
|
|
| -AudioConverter::AudioConverter(int src_channels, size_t src_frames,
|
| - int dst_channels, size_t dst_frames)
|
| +AudioConverter::AudioConverter(size_t src_channels, size_t src_frames,
|
| + size_t dst_channels, size_t dst_frames)
|
| : src_channels_(src_channels),
|
| src_frames_(src_frames),
|
| dst_channels_(dst_channels),
|
|
|