Prepare to convert various types to size_t.

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 0b0e063a6fcc58723a62606343639b2bf3569fb1..92221551856e7f6dc79b0e730dc7ac67d2cc16f4 100644
--- a/webrtc/modules/interface/module_common_types.h
+++ b/webrtc/modules/interface/module_common_types.h
@@ -442,8 +442,9 @@ inline void AudioFrame::UpdateFrame(int id, uint32_t timestamp,
   num_channels_ = num_channels;
   energy_ = energy;
 
+  assert(num_channels >= 0);
   const int length = samples_per_channel * num_channels;

[Andrew MacDonald, 2015/06/10 01:27:37]

Not sure I looked at this file before. I assume samples_per_channel will become
a size_t later? 

[Peter Kasting, 2015/06/10 01:58:36]

Yes, as will |length|.

-  assert(length <= kMaxDataSizeSamples && length >= 0);
+  assert(length <= kMaxDataSizeSamples);
   if (data != NULL) {
     memcpy(data_, data, sizeof(int16_t) * length);
   } else {
@@ -466,8 +467,9 @@ inline void AudioFrame::CopyFrom(const AudioFrame& src) {
   energy_ = src.energy_;
   interleaved_ = src.interleaved_;
 
+  assert(num_channels_ >= 0);
   const int length = samples_per_channel_ * num_channels_;
-  assert(length <= kMaxDataSizeSamples && length >= 0);
+  assert(length <= kMaxDataSizeSamples);
   memcpy(data_, src.data_, sizeof(int16_t) * length);
 }