| Index: media/base/multi_channel_resampler.cc
|
| diff --git a/media/base/multi_channel_resampler.cc b/media/base/multi_channel_resampler.cc
|
| index 9aa00d88efb20d2cebf6dad4b717432f31938adf..ff7f8dd0cc19dd5cb6f5564dcd9a7d3a44a6204e 100644
|
| --- a/media/base/multi_channel_resampler.cc
|
| +++ b/media/base/multi_channel_resampler.cc
|
| @@ -13,6 +13,7 @@ namespace media {
|
|
|
| MultiChannelResampler::MultiChannelResampler(int channels,
|
| double io_sample_rate_ratio,
|
| + size_t request_size,
|
| const ReadCB& read_cb)
|
| : last_frame_count_(0),
|
| read_cb_(read_cb),
|
| @@ -20,8 +21,9 @@ MultiChannelResampler::MultiChannelResampler(int channels,
|
| // Allocate each channel's resampler.
|
| resamplers_.reserve(channels);
|
| for (int i = 0; i < channels; ++i) {
|
| - resamplers_.push_back(new SincResampler(io_sample_rate_ratio, base::Bind(
|
| - &MultiChannelResampler::ProvideInput, base::Unretained(this), i)));
|
| + resamplers_.push_back(new SincResampler(
|
| + io_sample_rate_ratio, request_size, base::Bind(
|
| + &MultiChannelResampler::ProvideInput, base::Unretained(this), i)));
|
| }
|
| }
|
|
|
| @@ -35,8 +37,8 @@ void MultiChannelResampler::Resample(AudioBus* audio_bus, int frames) {
|
| // SincResampler::ChunkSize() sized chunks. SincResampler guarantees it will
|
| // only call ProvideInput() once when we resample this way.
|
| output_frames_ready_ = 0;
|
| - int chunk_size = resamplers_[0]->ChunkSize();
|
| while (output_frames_ready_ < frames) {
|
| + int chunk_size = resamplers_[0]->ChunkSize();
|
| int frames_this_time = std::min(frames - output_frames_ready_, chunk_size);
|
|
|
| // Resample each channel.
|
|
|