Index: webrtc/modules/rtp_rtcp/source/rtp_payload_registry.cc |
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_payload_registry.cc b/webrtc/modules/rtp_rtcp/source/rtp_payload_registry.cc |
index 8e2ff1742ef941ac975c07602bb95d9180f11f93..c3ff29cb8bdc7dc785845c3689ad9bdc410e395a 100644 |
--- a/webrtc/modules/rtp_rtcp/source/rtp_payload_registry.cc |
+++ b/webrtc/modules/rtp_rtcp/source/rtp_payload_registry.cc |
@@ -40,7 +40,7 @@ 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); |
@@ -139,7 +139,7 @@ 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) { |
@@ -171,7 +171,7 @@ void RTPPayloadRegistry::DeregisterAudioCodecOrRedTypeRegardlessOfPayloadType( |
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); |
@@ -370,7 +370,7 @@ class RTPPayloadAudioStrategy : public RTPPayloadStrategy { |
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 && |
@@ -389,7 +389,7 @@ class RTPPayloadAudioStrategy : public RTPPayloadStrategy { |
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; |
@@ -413,7 +413,7 @@ class RTPPayloadVideoStrategy : public RTPPayloadStrategy { |
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; |
} |
@@ -427,7 +427,7 @@ class RTPPayloadVideoStrategy : public RTPPayloadStrategy { |
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; |