Don't declare function arguments of array type
They just decay to pointers anyway, so it's more honest to declare
them as pointers.
BUG=webrtc:5805
Review-Url: https://codereview.webrtc.org/2515163002
Cr-Commit-Position: refs/heads/master@{#15165}
diff --git a/webrtc/modules/rtp_rtcp/include/rtp_payload_registry.h b/webrtc/modules/rtp_rtcp/include/rtp_payload_registry.h
index fea2293..fd228e1 100644
--- a/webrtc/modules/rtp_rtcp/include/rtp_payload_registry.h
+++ b/webrtc/modules/rtp_rtcp/include/rtp_payload_registry.h
@@ -38,12 +38,11 @@
virtual void UpdatePayloadRate(RtpUtility::Payload* payload,
uint32_t rate) const = 0;
- virtual RtpUtility::Payload* CreatePayloadType(
- const char payload_name[RTP_PAYLOAD_NAME_SIZE],
- int8_t payload_type,
- uint32_t frequency,
- size_t channels,
- uint32_t rate) const = 0;
+ virtual RtpUtility::Payload* CreatePayloadType(const char* payload_name,
+ int8_t payload_type,
+ uint32_t frequency,
+ size_t channels,
+ uint32_t rate) const = 0;
virtual int GetPayloadTypeFrequency(
const RtpUtility::Payload& payload) const = 0;
@@ -60,7 +59,7 @@
explicit RTPPayloadRegistry(RTPPayloadStrategy* rtp_payload_strategy);
~RTPPayloadRegistry();
- int32_t RegisterReceivePayload(const char payload_name[RTP_PAYLOAD_NAME_SIZE],
+ int32_t RegisterReceivePayload(const char* payload_name,
int8_t payload_type,
uint32_t frequency,
size_t channels,
@@ -69,7 +68,7 @@
int32_t DeRegisterReceivePayload(int8_t payload_type);
- int32_t ReceivePayloadType(const char payload_name[RTP_PAYLOAD_NAME_SIZE],
+ int32_t ReceivePayloadType(const char* payload_name,
uint32_t frequency,
size_t channels,
uint32_t rate,
@@ -144,7 +143,7 @@
private:
// Prunes the payload type map of the specific payload type, if it exists.
void DeregisterAudioCodecOrRedTypeRegardlessOfPayloadType(
- const char payload_name[RTP_PAYLOAD_NAME_SIZE],
+ const char* payload_name,
size_t payload_name_length,
uint32_t frequency,
size_t channels,
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_payload_registry.cc b/webrtc/modules/rtp_rtcp/source/rtp_payload_registry.cc
index 84b200c..4188f97 100644
--- a/webrtc/modules/rtp_rtcp/source/rtp_payload_registry.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtp_payload_registry.cc
@@ -34,7 +34,7 @@
}
int32_t RTPPayloadRegistry::RegisterReceivePayload(
- const char payload_name[RTP_PAYLOAD_NAME_SIZE],
+ const char* const payload_name,
const int8_t payload_type,
const uint32_t frequency,
const size_t channels,
@@ -133,7 +133,7 @@
// 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 char* const payload_name,
const size_t payload_name_length,
const uint32_t frequency,
const size_t channels,
@@ -165,12 +165,11 @@
}
}
-int32_t RTPPayloadRegistry::ReceivePayloadType(
- const char payload_name[RTP_PAYLOAD_NAME_SIZE],
- const uint32_t frequency,
- const size_t channels,
- const uint32_t rate,
- int8_t* payload_type) const {
+int32_t RTPPayloadRegistry::ReceivePayloadType(const char* const payload_name,
+ const uint32_t frequency,
+ const size_t channels,
+ const uint32_t rate,
+ int8_t* payload_type) const {
assert(payload_type);
size_t payload_name_length = strlen(payload_name);
@@ -388,12 +387,11 @@
payload->typeSpecific.Audio.rate = rate;
}
- RtpUtility::Payload* CreatePayloadType(
- const char payloadName[RTP_PAYLOAD_NAME_SIZE],
- const int8_t payloadType,
- const uint32_t frequency,
- const size_t channels,
- const uint32_t rate) const override {
+ RtpUtility::Payload* CreatePayloadType(const char* const payloadName,
+ const int8_t payloadType,
+ const uint32_t frequency,
+ 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);
@@ -425,12 +423,11 @@
void UpdatePayloadRate(RtpUtility::Payload* payload,
const uint32_t rate) const override {}
- RtpUtility::Payload* CreatePayloadType(
- const char payloadName[RTP_PAYLOAD_NAME_SIZE],
- const int8_t payloadType,
- const uint32_t frequency,
- const size_t channels,
- const uint32_t rate) const override {
+ RtpUtility::Payload* CreatePayloadType(const char* const payloadName,
+ const int8_t payloadType,
+ const uint32_t frequency,
+ const size_t channels,
+ const uint32_t rate) const override {
RtpVideoCodecTypes videoType = kRtpVideoGeneric;
if (RtpUtility::StringCompare(payloadName, "VP8", 3)) {
