Convert channel counts to size_t.

talk/app/webrtc/webrtcsdp.cc

 /*
  * libjingle
  * Copyright 2011 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 2042 matching lines @@
 //  12   QCELP       A            8,000       1
 //  13   CN          A            8,000       1
 //  14   MPA         A           90,000       (see text)
 //  15   G728        A            8,000       1
 //  16   DVI4        A           11,025       1
 //  17   DVI4        A           22,050       1
 //  18   G729        A            8,000       1
 struct StaticPayloadAudioCodec {
   const char* name;
   int clockrate;
-  int channels;
+  size_t channels;
 };
 static const StaticPayloadAudioCodec kStaticPayloadAudioCodecs[] = {
   { "PCMU", 8000, 1 },
   { "reserved", 0, 0 },
   { "reserved", 0, 0 },
   { "GSM", 8000, 1 },
   { "G723", 8000, 1 },
   { "DVI4", 8000, 1 },
   { "DVI4", 16000, 1 },
   { "LPC", 8000, 1 },
@@ skipping 18 matching lines @@
   int preference = static_cast<int>(fmts.size());
   std::vector<int>::const_iterator it = fmts.begin();
   bool add_new_codec = false;
   for (; it != fmts.end(); ++it) {
     int payload_type = *it;
     if (!media_desc->HasCodec(payload_type) &&
         payload_type >= 0 &&
         payload_type < arraysize(kStaticPayloadAudioCodecs)) {
       std::string encoding_name = kStaticPayloadAudioCodecs[payload_type].name;
       int clock_rate = kStaticPayloadAudioCodecs[payload_type].clockrate;
-      int channels = kStaticPayloadAudioCodecs[payload_type].channels;
+      size_t channels = kStaticPayloadAudioCodecs[payload_type].channels;
       media_desc->AddCodec(cricket::AudioCodec(payload_type, encoding_name,
                                                clock_rate, 0, channels,
                                                preference));
       add_new_codec = true;
     }
     --preference;
   }
   if (add_new_codec) {
     media_desc->SortCodecs();
   }
@@ skipping 714 matching lines @@
     session_params = fields[3];
   }
   media_desc->AddCrypto(CryptoParams(tag, crypto_suite, key_params,
                                      session_params));
   return true;
 }
 
 // Updates or creates a new codec entry in the audio description with according
 // to |name|, |clockrate|, |bitrate|, |channels| and |preference|.
 void UpdateCodec(int payload_type, const std::string& name, int clockrate,
-                 int bitrate, int channels, int preference,
+                 int bitrate, size_t channels, int preference,
                  AudioContentDescription* audio_desc) {
   // Codec may already be populated with (only) optional parameters
   // (from an fmtp).
   cricket::AudioCodec codec =
       GetCodecWithPayloadType(audio_desc->codecs(), payload_type);
   codec.name = name;
   codec.clockrate = clockrate;
   codec.bitrate = bitrate;
   codec.channels = channels;
   codec.preference = preference;
@@ skipping 78 matching lines @@
                 JsepSessionDescription::kMaxVideoCodecWidth,
                 JsepSessionDescription::kMaxVideoCodecHeight,
                 JsepSessionDescription::kDefaultVideoCodecFramerate,
                 preference, video_desc);
   } else if (media_type == cricket::MEDIA_TYPE_AUDIO) {
     // RFC 4566
     // For audio streams, <encoding parameters> indicates the number
     // of audio channels.  This parameter is OPTIONAL and may be
     // omitted if the number of channels is one, provided that no
     // additional parameters are needed.
-    int channels = 1;
+    size_t channels = 1;
     if (codec_params.size() == 3) {
       if (!GetValueFromString(line, codec_params[2], &channels, error)) {
         return false;
       }
     }
     int bitrate = 0;
     // The default behavior for ISAC (bitrate == 0) in webrtcvoiceengine.cc
     // (specifically FindWebRtcCodec) is bandwidth-adaptive variable bitrate.
     // The bandwidth adaptation doesn't always work well, so this code
     // sets a fixed target bitrate instead.
@@ skipping 126 matching lines @@
     UpdateCodec<AudioContentDescription, cricket::AudioCodec>(
         media_desc, payload_type, feedback_param);
   } else if (media_type == cricket::MEDIA_TYPE_VIDEO) {
     UpdateCodec<VideoContentDescription, cricket::VideoCodec>(
         media_desc, payload_type, feedback_param);
   }
   return true;
 }
 
 }  // namespace webrtc