Address Windows 64-bits warnings.
R=henrik.lundin@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/2203004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@4803 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/webrtc/modules/audio_coding/neteq4/preemptive_expand.cc b/webrtc/modules/audio_coding/neteq4/preemptive_expand.cc
index 8522368..195315f 100644
--- a/webrtc/modules/audio_coding/neteq4/preemptive_expand.cc
+++ b/webrtc/modules/audio_coding/neteq4/preemptive_expand.cc
@@ -38,7 +38,7 @@
length_change_samples);
}
-void PreemptiveExpand::SetParametersForPassiveSpeech(int len,
+void PreemptiveExpand::SetParametersForPassiveSpeech(size_t len,
int16_t* best_correlation,
int* peak_index) const {
// When the signal does not contain any active speech, the correlation does
@@ -49,11 +49,12 @@
// but we must ensure that best_correlation is not larger than the length of
// the new data.
// but we must ensure that best_correlation is not larger than the new data.
- *peak_index = std::min(*peak_index, len - old_data_length_per_channel_);
+ *peak_index = std::min(*peak_index,
+ static_cast<int>(len - old_data_length_per_channel_));
}
PreemptiveExpand::ReturnCodes PreemptiveExpand::CheckCriteriaAndStretch(
- const int16_t *input, int input_length, size_t peak_index,
+ const int16_t *input, size_t input_length, size_t peak_index,
int16_t best_correlation, bool active_speech,
AudioMultiVector<int16_t>* output) const {
// Pre-calculate common multiplication with |fs_mult_|.
