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

webrtc/modules/interface/module_common_types.h

Index: webrtc/modules/interface/module_common_types.h
diff --git a/webrtc/modules/interface/module_common_types.h b/webrtc/modules/interface/module_common_types.h
index 1202eee0435c3774b7daf45a2eb20384dc6d4205..97a69692b249258b22271bee28c3cfeb2efd4683 100644
--- a/webrtc/modules/interface/module_common_types.h
+++ b/webrtc/modules/interface/module_common_types.h
@@ -342,7 +342,7 @@ struct VideoContentMetrics {
 class AudioFrame {
  public:
   // Stereo, 32 kHz, 60 ms (2 * 32 * 60)
-  static const int kMaxDataSizeSamples = 3840;
+  static const size_t kMaxDataSizeSamples = 3840;
 
   enum VADActivity {
     kVadActive = 0,
@@ -366,7 +366,7 @@ class AudioFrame {
 
   // |interleaved_| is not changed by this method.
   void UpdateFrame(int id, uint32_t timestamp, const int16_t* data,
-                   int samples_per_channel, int sample_rate_hz,
+                   size_t samples_per_channel, int sample_rate_hz,
                    SpeechType speech_type, VADActivity vad_activity,
                    int num_channels = 1, uint32_t energy = -1);
 
@@ -390,7 +390,7 @@ class AudioFrame {
   // -1 represents an uninitialized value.
   int64_t ntp_time_ms_;
   int16_t data_[kMaxDataSizeSamples];
-  int samples_per_channel_;
+  size_t samples_per_channel_;
   int sample_rate_hz_;
   int num_channels_;
   SpeechType speech_type_;
@@ -430,7 +430,7 @@ inline void AudioFrame::Reset() {
 inline void AudioFrame::UpdateFrame(int id,
                                     uint32_t timestamp,
                                     const int16_t* data,
-                                    int samples_per_channel,
+                                    size_t samples_per_channel,
                                     int sample_rate_hz,
                                     SpeechType speech_type,
                                     VADActivity vad_activity,
@@ -446,7 +446,7 @@ inline void AudioFrame::UpdateFrame(int id,
   energy_ = energy;
 
   assert(num_channels >= 0);
-  const int length = samples_per_channel * num_channels;
+  const size_t length = samples_per_channel * num_channels;
   assert(length <= kMaxDataSizeSamples);
   if (data != NULL) {
     memcpy(data_, data, sizeof(int16_t) * length);
@@ -471,7 +471,7 @@ inline void AudioFrame::CopyFrom(const AudioFrame& src) {
   interleaved_ = src.interleaved_;
 
   assert(num_channels_ >= 0);
-  const int length = samples_per_channel_ * num_channels_;
+  const size_t length = samples_per_channel_ * num_channels_;
   assert(length <= kMaxDataSizeSamples);
   memcpy(data_, src.data_, sizeof(int16_t) * length);
 }
@@ -484,7 +484,7 @@ inline AudioFrame& AudioFrame::operator>>=(const int rhs) {
   assert((num_channels_ > 0) && (num_channels_ < 3));
   if ((num_channels_ > 2) || (num_channels_ < 1)) return *this;
 
-  for (int i = 0; i < samples_per_channel_ * num_channels_; i++) {
+  for (size_t i = 0; i < samples_per_channel_ * num_channels_; i++) {
     data_[i] = static_cast<int16_t>(data_[i] >> rhs);
   }
   return *this;
@@ -506,8 +506,8 @@ inline AudioFrame& AudioFrame::Append(const AudioFrame& rhs) {
     speech_type_ = kUndefined;
   }
 
-  int offset = samples_per_channel_ * num_channels_;
-  for (int i = 0; i < rhs.samples_per_channel_ * rhs.num_channels_; i++) {
+  size_t offset = samples_per_channel_ * num_channels_;
+  for (size_t i = 0; i < rhs.samples_per_channel_ * rhs.num_channels_; i++) {
     data_[offset + i] = rhs.data_[i];
   }
   samples_per_channel_ += rhs.samples_per_channel_;
@@ -557,7 +557,7 @@ inline AudioFrame& AudioFrame::operator+=(const AudioFrame& rhs) {
            sizeof(int16_t) * rhs.samples_per_channel_ * num_channels_);
   } else {
     // IMPROVEMENT this can be done very fast in assembly
-    for (int i = 0; i < samples_per_channel_ * num_channels_; i++) {
+    for (size_t i = 0; i < samples_per_channel_ * num_channels_; i++) {
       int32_t wrap_guard =
           static_cast<int32_t>(data_[i]) + static_cast<int32_t>(rhs.data_[i]);
       data_[i] = ClampToInt16(wrap_guard);
@@ -582,7 +582,7 @@ inline AudioFrame& AudioFrame::operator-=(const AudioFrame& rhs) {
   }
   speech_type_ = kUndefined;
 
-  for (int i = 0; i < samples_per_channel_ * num_channels_; i++) {
+  for (size_t i = 0; i < samples_per_channel_ * num_channels_; i++) {
     int32_t wrap_guard =
         static_cast<int32_t>(data_[i]) - static_cast<int32_t>(rhs.data_[i]);
     data_[i] = ClampToInt16(wrap_guard);