[NOT FOR REVIEW] Convert channel counts to size_t.

webrtc/modules/audio_coding/main/acm2/acm_codec_database.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 66 matching lines @@
 #ifdef ENABLE_48000_HZ
   {100, "CN", 48000, 1440, 1, 0},
 #endif
 #ifdef WEBRTC_CODEC_AVT
   {106, "telephone-event", 8000, 240, 1, 0},
 #endif
 #ifdef WEBRTC_CODEC_RED
   {127, "red", 8000, 0, 1, 0},
 #endif
   // To prevent compile errors due to trailing commas.
-  {-1, "Null", -1, -1, -1, -1}
+  {-1, "Null", -1, -1, 0, -1}
 };
 
 // Create database with all codec settings at compile time.
 // Each entry needs the following parameters in the given order:
 // Number of allowed packet sizes, a vector with the allowed packet sizes,
 // Basic block samples, max number of channels that are supported.
 const ACMCodecDB::CodecSettings ACMCodecDB::codec_settings_[] = {
 #if (defined(WEBRTC_CODEC_ISAC) || defined(WEBRTC_CODEC_ISACFX))
     {2, {kIsacPacSize480, kIsacPacSize960}, 0, 1, true},
 # if (defined(WEBRTC_CODEC_ISAC))
@@ skipping 40 matching lines @@
 #ifdef ENABLE_48000_HZ
     {1, {1440}, 1440, 1, false},
 #endif
 #ifdef WEBRTC_CODEC_AVT
     {1, {240}, 240, 1, false},
 #endif
 #ifdef WEBRTC_CODEC_RED
     {1, {0}, 0, 1, false},
 #endif
     // To prevent compile errors due to trailing commas.
-    {-1, {-1}, -1, -1, false}
+    {-1, {-1}, -1, 0, false}
 };
 
 // Create a database of all NetEQ decoders at compile time.
 const NetEqDecoder ACMCodecDB::neteq_decoders_[] = {
 #if (defined(WEBRTC_CODEC_ISAC) || defined(WEBRTC_CODEC_ISACFX))
     kDecoderISAC,
 # if (defined(WEBRTC_CODEC_ISAC))
     kDecoderISACswb,
     kDecoderISACfb,
 # endif
@@ skipping 146 matching lines @@
 // Looks for a matching payload name, frequency, and channels in the
 // codec list. Need to check all three since some codecs have several codec
 // entries with different frequencies and/or channels.
 // Does not check other codec settings, such as payload type and packet size.
 // Returns the id of the codec, or -1 if no match is found.
 int ACMCodecDB::CodecId(const CodecInst& codec_inst) {
   return (CodecId(codec_inst.plname, codec_inst.plfreq,
                   codec_inst.channels));
 }
 
-int ACMCodecDB::CodecId(const char* payload_name, int frequency, int channels) {
+int ACMCodecDB::CodecId(const char* payload_name,
+                        int frequency,
+                        size_t channels) {
   for (int id = 0; id < kNumCodecs; id++) {
     bool name_match = false;
     bool frequency_match = false;
     bool channels_match = false;
 
     // Payload name, sampling frequency and number of channels need to match.
     // NOTE! If |frequency| is -1, the frequency is not applicable, and is
     // always treated as true, like for RED.
     name_match = (STR_CASE_CMP(database_[id].plname, payload_name) == 0);
     frequency_match = (frequency == database_[id].plfreq) || (frequency == -1);
@@ skipping 147 matching lines @@
 }
 
 bool ACMCodecDB::OwnsDecoder(int codec_id) {
   assert(codec_id >= 0 && codec_id < ACMCodecDB::kNumCodecs);
   return ACMCodecDB::codec_settings_[codec_id].owns_decoder;
 }
 
 }  // namespace acm2
 
 }  // namespace webrtc