Convert channel counts to size_t.

webrtc/modules/rtp_rtcp/source/rtp_payload_registry.cc

 /*
  *  Copyright (c) 2013 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 22 matching lines @@
     RtpUtility::PayloadTypeMap::iterator it = payload_type_map_.begin();
     delete it->second;
     payload_type_map_.erase(it);
   }
 }
 
 int32_t RTPPayloadRegistry::RegisterReceivePayload(
     const char payload_name[RTP_PAYLOAD_NAME_SIZE],
     const int8_t payload_type,
     const uint32_t frequency,
-    const uint8_t channels,
+    const size_t channels,
     const uint32_t rate,
     bool* created_new_payload) {
   assert(payload_type >= 0);
   assert(payload_name);
   *created_new_payload = false;
 
   // Sanity check.
   switch (payload_type) {
     // Reserved payload types to avoid RTCP conflicts when marker bit is set.
     case 64:        //  192 Full INTRA-frame request.
@@ skipping 78 matching lines @@
   return 0;
 }
 
 // There can't be several codecs with the same rate, frequency and channels
 // for audio codecs, but there can for video.
 // Always called from within a critical section.
 void RTPPayloadRegistry::DeregisterAudioCodecOrRedTypeRegardlessOfPayloadType(
     const char payload_name[RTP_PAYLOAD_NAME_SIZE],
     const size_t payload_name_length,
     const uint32_t frequency,
-    const uint8_t channels,
+    const size_t channels,
     const uint32_t rate) {
   RtpUtility::PayloadTypeMap::iterator iterator = payload_type_map_.begin();
   for (; iterator != payload_type_map_.end(); ++iterator) {
     RtpUtility::Payload* payload = iterator->second;
     size_t name_length = strlen(payload->name);
 
     if (payload_name_length == name_length &&
         RtpUtility::StringCompare(
             payload->name, payload_name, payload_name_length)) {
       // We found the payload name in the list.
@@ skipping 11 matching lines @@
         payload_type_map_.erase(iterator);
         break;
       }
     }
   }
 }
 
 int32_t RTPPayloadRegistry::ReceivePayloadType(
     const char payload_name[RTP_PAYLOAD_NAME_SIZE],
     const uint32_t frequency,
-    const uint8_t channels,
+    const size_t channels,
     const uint32_t rate,
     int8_t* payload_type) const {
   assert(payload_type);
   size_t payload_name_length = strlen(payload_name);
 
   CriticalSectionScoped cs(crit_sect_.get());
 
   RtpUtility::PayloadTypeMap::const_iterator it = payload_type_map_.begin();
 
   for (; it != payload_type_map_.end(); ++it) {
@@ skipping 196 matching lines @@
   last_received_media_payload_type_ = media_payload_type;
   return false;
 }
 
 class RTPPayloadAudioStrategy : public RTPPayloadStrategy {
  public:
   bool CodecsMustBeUnique() const override { return true; }
 
   bool PayloadIsCompatible(const RtpUtility::Payload& payload,
                            const uint32_t frequency,
-                           const uint8_t channels,
+                           const size_t channels,
                            const uint32_t rate) const override {
     return
         payload.audio &&
         payload.typeSpecific.Audio.frequency == frequency &&
         payload.typeSpecific.Audio.channels == channels &&
         (payload.typeSpecific.Audio.rate == rate ||
             payload.typeSpecific.Audio.rate == 0 || rate == 0);
   }
 
   void UpdatePayloadRate(RtpUtility::Payload* payload,
                          const uint32_t rate) const override {
     payload->typeSpecific.Audio.rate = rate;
   }
 
   RtpUtility::Payload* CreatePayloadType(
       const char payloadName[RTP_PAYLOAD_NAME_SIZE],
       const int8_t payloadType,
       const uint32_t frequency,
-      const uint8_t channels,
+      const size_t channels,
       const uint32_t rate) const override {
     RtpUtility::Payload* payload = new RtpUtility::Payload;
     payload->name[RTP_PAYLOAD_NAME_SIZE - 1] = 0;
     strncpy(payload->name, payloadName, RTP_PAYLOAD_NAME_SIZE - 1);
     assert(frequency >= 1000);
     payload->typeSpecific.Audio.frequency = frequency;
     payload->typeSpecific.Audio.channels = channels;
     payload->typeSpecific.Audio.rate = rate;
     payload->audio = true;
     return payload;
   }
 
   int GetPayloadTypeFrequency(const RtpUtility::Payload& payload) const {
     return payload.typeSpecific.Audio.frequency;
   }
 };
 
 class RTPPayloadVideoStrategy : public RTPPayloadStrategy {
  public:
   bool CodecsMustBeUnique() const override { return false; }
 
   bool PayloadIsCompatible(const RtpUtility::Payload& payload,
                            const uint32_t frequency,
-                           const uint8_t channels,
+                           const size_t channels,
                            const uint32_t rate) const override {
     return !payload.audio;
   }
 
   void UpdatePayloadRate(RtpUtility::Payload* payload,
                          const uint32_t rate) const override {
     payload->typeSpecific.Video.maxRate = rate;
   }
 
   RtpUtility::Payload* CreatePayloadType(
       const char payloadName[RTP_PAYLOAD_NAME_SIZE],
       const int8_t payloadType,
       const uint32_t frequency,
-      const uint8_t channels,
+      const size_t channels,
       const uint32_t rate) const override {
     RtpVideoCodecTypes videoType = kRtpVideoGeneric;
 
     if (RtpUtility::StringCompare(payloadName, "VP8", 3)) {
       videoType = kRtpVideoVp8;
     } else if (RtpUtility::StringCompare(payloadName, "VP9", 3)) {
       videoType = kRtpVideoVp9;
     } else if (RtpUtility::StringCompare(payloadName, "H264", 4)) {
       videoType = kRtpVideoH264;
     } else if (RtpUtility::StringCompare(payloadName, "I420", 4)) {
@@ skipping 22 matching lines @@
 RTPPayloadStrategy* RTPPayloadStrategy::CreateStrategy(
     const bool handling_audio) {
   if (handling_audio) {
     return new RTPPayloadAudioStrategy();
   } else {
     return new RTPPayloadVideoStrategy();
   }
 }
 
 }  // namespace webrtc