From 8a40edd802b6a1b9c4d0949be392ade252cad217 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=B6ller?= Date: Thu, 24 Jan 2019 18:04:44 +0100 Subject: [PATCH] Delete constant RTP_PAYLOAD_NAME_SIZE Followup to cl https://webrtc-review.googlesource.com/c/src/+/119661 Bug: webrtc:6883 Change-Id: Ie3a06f7381a73b16fc5e7cd22366997cc95608ac Reviewed-on: https://webrtc-review.googlesource.com/c/119760 Reviewed-by: Danil Chapovalov Reviewed-by: Karl Wiberg Commit-Queue: Niels Moller Cr-Commit-Position: refs/heads/master@{#26398} --- common_types.h | 2 -- modules/rtp_rtcp/source/rtp_sender.cc | 1 - modules/rtp_rtcp/source/rtp_sender_unittest.cc | 18 +++++++++--------- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/common_types.h b/common_types.h index 2422ce0c31..2b877d6e5e 100644 --- a/common_types.h +++ b/common_types.h @@ -23,8 +23,6 @@ #pragma warning(disable : 4351) #endif -#define RTP_PAYLOAD_NAME_SIZE 32u - namespace webrtc { enum FrameType { diff --git a/modules/rtp_rtcp/source/rtp_sender.cc b/modules/rtp_rtcp/source/rtp_sender.cc index 3ad8d9a0dc..014c380201 100644 --- a/modules/rtp_rtcp/source/rtp_sender.cc +++ b/modules/rtp_rtcp/source/rtp_sender.cc @@ -274,7 +274,6 @@ int32_t RTPSender::RegisterPayload(absl::string_view payload_name, uint32_t frequency, size_t channels, uint32_t rate) { - RTC_DCHECK_LT(payload_name.size(), RTP_PAYLOAD_NAME_SIZE); rtc::CritScope lock(&send_critsect_); int32_t ret_val = 0; diff --git a/modules/rtp_rtcp/source/rtp_sender_unittest.cc b/modules/rtp_rtcp/source/rtp_sender_unittest.cc index 68f2402e05..c4a38dea33 100644 --- a/modules/rtp_rtcp/source/rtp_sender_unittest.cc +++ b/modules/rtp_rtcp/source/rtp_sender_unittest.cc @@ -261,7 +261,7 @@ class RtpSenderTest : public ::testing::TestWithParam { const uint32_t kTimestamp = 1234; const uint8_t kPayloadType = 127; const int64_t kCaptureTimeMs = fake_clock_.TimeInMilliseconds(); - char payload_name[RTP_PAYLOAD_NAME_SIZE] = "GENERIC"; + const char payload_name[] = "GENERIC"; EXPECT_EQ(0, rtp_sender_->RegisterPayload(payload_name, kPayloadType, 90000, 0, 1500)); @@ -559,7 +559,7 @@ TEST_P(RtpSenderTestWithoutPacer, OnSendSideDelayUpdated) { const uint8_t kPayloadType = 127; const uint32_t kCaptureTimeMsToRtpTimestamp = 90; // 90 kHz clock - char payload_name[RTP_PAYLOAD_NAME_SIZE] = "GENERIC"; + const char payload_name[] = "GENERIC"; RTPVideoHeader video_header; EXPECT_EQ(0, rtp_sender_->RegisterPayload(payload_name, kPayloadType, 1000 * kCaptureTimeMsToRtpTimestamp, @@ -1116,7 +1116,7 @@ TEST_P(RtpSenderTest, SendRedundantPayloads) { } TEST_P(RtpSenderTestWithoutPacer, SendGenericVideo) { - char payload_name[RTP_PAYLOAD_NAME_SIZE] = "GENERIC"; + const char payload_name[] = "GENERIC"; const uint8_t payload_type = 127; ASSERT_EQ(0, rtp_sender_->RegisterPayload(payload_name, payload_type, 90000, 0, 1500)); @@ -1251,7 +1251,7 @@ TEST_P(RtpSenderTest, NoFlexfecForTimingFrames) { const uint32_t kTimestamp = 1234; const uint8_t kPayloadType = 127; const int64_t kCaptureTimeMs = fake_clock_.TimeInMilliseconds(); - char payload_name[RTP_PAYLOAD_NAME_SIZE] = "GENERIC"; + const char payload_name[] = "GENERIC"; EXPECT_EQ(0, rtp_sender_->RegisterPayload(payload_name, kPayloadType, 90000, 0, 1500)); RTPVideoHeader video_header; @@ -1494,7 +1494,7 @@ TEST_P(RtpSenderTest, FrameCountCallbacks) { nullptr, nullptr, &callback, nullptr, nullptr, nullptr, &retransmission_rate_limiter_, nullptr, false, nullptr, false, false)); rtp_sender_->SetSSRC(kSsrc); - char payload_name[RTP_PAYLOAD_NAME_SIZE] = "GENERIC"; + const char payload_name[] = "GENERIC"; const uint8_t payload_type = 127; ASSERT_EQ(0, rtp_sender_->RegisterPayload(payload_name, payload_type, 90000, 0, 1500)); @@ -1568,7 +1568,7 @@ TEST_P(RtpSenderTest, BitrateCallbacks) { // Overhead = 12 bytes RTP header + 1 byte generic header. const uint32_t kPacketOverhead = 13; - char payload_name[RTP_PAYLOAD_NAME_SIZE] = "GENERIC"; + const char payload_name[] = "GENERIC"; const uint8_t payload_type = 127; ASSERT_EQ(0, rtp_sender_->RegisterPayload(payload_name, payload_type, 90000, 0, 1500)); @@ -1654,7 +1654,7 @@ TEST_P(RtpSenderTestWithoutPacer, StreamDataCountersCallbacks) { const uint8_t kRedPayloadType = 96; const uint8_t kUlpfecPayloadType = 97; - char payload_name[RTP_PAYLOAD_NAME_SIZE] = "GENERIC"; + const char payload_name[] = "GENERIC"; const uint8_t payload_type = 127; ASSERT_EQ(0, rtp_sender_->RegisterPayload(payload_name, payload_type, 90000, 0, 1500)); @@ -1721,7 +1721,7 @@ TEST_P(RtpSenderTestWithoutPacer, StreamDataCountersCallbacks) { } TEST_P(RtpSenderAudioTest, SendAudio) { - char payload_name[RTP_PAYLOAD_NAME_SIZE] = "PAYLOAD_NAME"; + const char payload_name[] = "PAYLOAD_NAME"; const uint8_t payload_type = 127; ASSERT_EQ(0, rtp_sender_->RegisterPayload(payload_name, payload_type, 48000, 0, 1500)); @@ -1741,7 +1741,7 @@ TEST_P(RtpSenderAudioTest, SendAudioWithAudioLevelExtension) { EXPECT_EQ(0, rtp_sender_->RegisterRtpHeaderExtension(kRtpExtensionAudioLevel, kAudioLevelExtensionId)); - char payload_name[RTP_PAYLOAD_NAME_SIZE] = "PAYLOAD_NAME"; + const char payload_name[] = "PAYLOAD_NAME"; const uint8_t payload_type = 127; ASSERT_EQ(0, rtp_sender_->RegisterPayload(payload_name, payload_type, 48000, 0, 1500));