Update audio code to use size_t more correctly, webrtc/voice_engine/ portion.

webrtc/voice_engine/channel.cc

Index: webrtc/voice_engine/channel.cc
diff --git a/webrtc/voice_engine/channel.cc b/webrtc/voice_engine/channel.cc
index 8992425b537b0e32d329a470d58fe50d2619171d..7bf74d93a500beee98f1a8a204356fd1f4db6a55 100644
--- a/webrtc/voice_engine/channel.cc
+++ b/webrtc/voice_engine/channel.cc
@@ -3336,7 +3336,7 @@ Channel::Demultiplex(const AudioFrame& audioFrame)
 
 void Channel::Demultiplex(const int16_t* audio_data,
                           int sample_rate,
-                          int number_of_frames,
+                          size_t number_of_frames,
                           int number_of_channels) {

[pbos-webrtc, 2015/07/14 08:15:10]

Make number_of_channels size_t as well?

   CodecInst codec;
   GetSendCodec(codec);
@@ -3398,7 +3398,8 @@ Channel::PrepareEncodeAndSend(int mixingFrequency)
     InsertInbandDtmfTone();
 
     if (_includeAudioLevelIndication) {
-      int length = _audioFrame.samples_per_channel_ * _audioFrame.num_channels_;
+      size_t length =
+          _audioFrame.samples_per_channel_ * _audioFrame.num_channels_;
       if (is_muted) {
         rms_level_.ProcessMuted(length);
       } else {
@@ -3713,7 +3714,7 @@ int32_t
 Channel::MixOrReplaceAudioWithFile(int mixingFrequency)
 {
   rtc::scoped_ptr<int16_t[]> fileBuffer(new int16_t[640]);
-    int fileSamples(0);
+    size_t fileSamples(0);
 
     {
         CriticalSectionScoped cs(&_fileCritSect);
@@ -3783,7 +3784,7 @@ Channel::MixAudioWithFile(AudioFrame& audioFrame,
     assert(mixingFrequency <= 48000);
 
     rtc::scoped_ptr<int16_t[]> fileBuffer(new int16_t[960]);
-    int fileSamples(0);
+    size_t fileSamples(0);
 
     {
         CriticalSectionScoped cs(&_fileCritSect);
@@ -3821,8 +3822,8 @@ Channel::MixAudioWithFile(AudioFrame& audioFrame,
     else
     {
         WEBRTC_TRACE(kTraceWarning, kTraceVoice, VoEId(_instanceId,_channelId),
-            "Channel::MixAudioWithFile() samples_per_channel_(%d) != "
-            "fileSamples(%d)",
+            "Channel::MixAudioWithFile() samples_per_channel_(%" PRIuS ") != "

[henrika_webrtc, 2015/07/14 07:54:09]

Have not used this macro before. What does it expand to?

+            "fileSamples(%" PRIuS ")",
             audioFrame.samples_per_channel_, fileSamples);
         return -1;
     }
@@ -3882,7 +3883,7 @@ Channel::InsertInbandDtmfTone()
         }
 
         // Replace mixed audio with DTMF tone.
-        for (int sample = 0;
+        for (size_t sample = 0;
             sample < _audioFrame.samples_per_channel_;
             sample++)
         {
@@ -3890,7 +3891,8 @@ Channel::InsertInbandDtmfTone()
                 channel < _audioFrame.num_channels_;
                 channel++)
             {
-                const int index = sample * _audioFrame.num_channels_ + channel;
+                const size_t index =
+                    sample * _audioFrame.num_channels_ + channel;
                 _audioFrame.data_[index] = toneBuffer[sample];
             }
         }