| Index: webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc
 | 
| diff --git a/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc b/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc
 | 
| index b659649096e8c583400698e16a5b1723d3b4c4dc..ce98636ab2b28b43f2d056c14c8cf7b8e50554c1 100644
 | 
| --- a/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc
 | 
| +++ b/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc
 | 
| @@ -431,8 +431,8 @@ int AudioCodingModuleImpl::PreprocessToAddData(const AudioFrame& in_frame,
 | 
|  
 | 
|    if (!down_mix && !resample) {
 | 
|      // No pre-processing is required.
 | 
| -    expected_in_ts_ += in_frame.samples_per_channel_;
 | 
| -    expected_codec_ts_ += in_frame.samples_per_channel_;
 | 
| +    expected_in_ts_ += static_cast<uint32_t>(in_frame.samples_per_channel_);
 | 
| +    expected_codec_ts_ += static_cast<uint32_t>(in_frame.samples_per_channel_);
 | 
|      *ptr_out = &in_frame;
 | 
|      return 0;
 | 
|    }
 | 
| @@ -477,8 +477,9 @@ int AudioCodingModuleImpl::PreprocessToAddData(const AudioFrame& in_frame,
 | 
|          codec_manager_.CurrentEncoder()->SampleRateHz();
 | 
|    }
 | 
|  
 | 
| -  expected_codec_ts_ += preprocess_frame_.samples_per_channel_;
 | 
| -  expected_in_ts_ += in_frame.samples_per_channel_;
 | 
| +  expected_codec_ts_ +=
 | 
| +      static_cast<uint32_t>(preprocess_frame_.samples_per_channel_);
 | 
| +  expected_in_ts_ += static_cast<uint32_t>(in_frame.samples_per_channel_);
 | 
|  
 | 
|    return 0;
 | 
|  }
 | 
| 
 |