| Index: webrtc/modules/audio_processing/echo_cancellation_impl.cc
 | 
| diff --git a/webrtc/modules/audio_processing/echo_cancellation_impl.cc b/webrtc/modules/audio_processing/echo_cancellation_impl.cc
 | 
| index 6d0373d758ecc5a1c163be904686d5bb2e617ba4..bdcad200f2dccd2f501c99406c373e0242fb1277 100644
 | 
| --- a/webrtc/modules/audio_processing/echo_cancellation_impl.cc
 | 
| +++ b/webrtc/modules/audio_processing/echo_cancellation_impl.cc
 | 
| @@ -142,8 +142,8 @@ void EchoCancellationImpl::ReadQueuedRenderData() {
 | 
|  
 | 
|    while (render_signal_queue_->Remove(&capture_queue_buffer_)) {
 | 
|      size_t handle_index = 0;
 | 
| -    int buffer_index = 0;
 | 
| -    const int num_frames_per_band =
 | 
| +    size_t buffer_index = 0;
 | 
| +    const size_t num_frames_per_band =
 | 
|          capture_queue_buffer_.size() /
 | 
|          (apm_->num_output_channels() * apm_->num_reverse_channels());
 | 
|      for (int i = 0; i < apm_->num_output_channels(); i++) {
 | 
| @@ -491,8 +491,7 @@ int EchoCancellationImpl::ConfigureHandle(void* handle) const {
 | 
|  
 | 
|  int EchoCancellationImpl::num_handles_required() const {
 | 
|    // Not locked as it only relies on APM public API which is threadsafe.
 | 
| -  return apm_->num_output_channels() *
 | 
| -         apm_->num_reverse_channels();
 | 
| +  return apm_->num_output_channels() * apm_->num_reverse_channels();
 | 
|  }
 | 
|  
 | 
|  int EchoCancellationImpl::GetHandleError(void* handle) const {
 | 
| 
 |