From b59f337fbd9856bb6e3324460c4229f36c5c96bb Mon Sep 17 00:00:00 2001 From: Harald Alvestrand Date: Fri, 29 May 2020 14:42:36 +0200 Subject: [PATCH] Remove leftover SCTP "codec name" constants These were leftovers from a previous refactoring. Bug: none Change-Id: Iee12c2f7f9a7d80ae8e67aa9134ec84894f94960 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/176327 Reviewed-by: Taylor Reviewed-by: Karl Wiberg Commit-Queue: Harald Alvestrand Cr-Commit-Position: refs/heads/master@{#31392} --- media/base/media_constants.cc | 3 --- media/base/media_constants.h | 6 ------ media/engine/payload_type_mapper.cc | 1 - media/engine/payload_type_mapper_unittest.cc | 1 - pc/media_session.cc | 8 +++++--- 5 files changed, 5 insertions(+), 14 deletions(-) diff --git a/media/base/media_constants.cc b/media/base/media_constants.cc index 0665602534..03679d9627 100644 --- a/media/base/media_constants.cc +++ b/media/base/media_constants.cc @@ -98,9 +98,6 @@ const char kCodecParamMaxMessageSize[] = "x-google-max-message-size"; const int kGoogleRtpDataCodecPlType = 109; const char kGoogleRtpDataCodecName[] = "google-data"; -const int kGoogleSctpDataCodecPlType = 108; -const char kGoogleSctpDataCodecName[] = "google-sctp-data"; - const char kComfortNoiseCodecName[] = "CN"; const char kVp8CodecName[] = "VP8"; diff --git a/media/base/media_constants.h b/media/base/media_constants.h index a9c82e289f..d2bfb36ee9 100644 --- a/media/base/media_constants.h +++ b/media/base/media_constants.h @@ -124,12 +124,6 @@ extern const char kCodecParamMaxMessageSize[]; extern const int kGoogleRtpDataCodecPlType; extern const char kGoogleRtpDataCodecName[]; -// TODO(pthatcher): Find an id that won't conflict with anything. On -// the other hand, it really shouldn't matter since the id won't be -// used on the wire. -extern const int kGoogleSctpDataCodecPlType; -extern const char kGoogleSctpDataCodecName[]; - extern const char kComfortNoiseCodecName[]; RTC_EXPORT extern const char kVp8CodecName[]; diff --git a/media/engine/payload_type_mapper.cc b/media/engine/payload_type_mapper.cc index fcacd44883..e9f863ca63 100644 --- a/media/engine/payload_type_mapper.cc +++ b/media/engine/payload_type_mapper.cc @@ -67,7 +67,6 @@ PayloadTypeMapper::PayloadTypeMapper() {{kIsacCodecName, 32000, 1}, 104}, {{kCnCodecName, 16000, 1}, 105}, {{kCnCodecName, 32000, 1}, 106}, - {{kGoogleSctpDataCodecName, 0, 0}, kGoogleSctpDataCodecPlType}, {{kOpusCodecName, 48000, 2, diff --git a/media/engine/payload_type_mapper_unittest.cc b/media/engine/payload_type_mapper_unittest.cc index c8b2234c25..fa6864b48a 100644 --- a/media/engine/payload_type_mapper_unittest.cc +++ b/media/engine/payload_type_mapper_unittest.cc @@ -52,7 +52,6 @@ TEST_F(PayloadTypeMapperTest, WebRTCPayloadTypes) { return mapper_.FindMappingFor({name, 0, 0}); }; EXPECT_EQ(kGoogleRtpDataCodecPlType, data_mapping(kGoogleRtpDataCodecName)); - EXPECT_EQ(kGoogleSctpDataCodecPlType, data_mapping(kGoogleSctpDataCodecName)); EXPECT_EQ(102, mapper_.FindMappingFor({kIlbcCodecName, 8000, 1})); EXPECT_EQ(103, mapper_.FindMappingFor({kIsacCodecName, 16000, 1})); diff --git a/pc/media_session.cc b/pc/media_session.cc index 51885b4fc4..7db8126f79 100644 --- a/pc/media_session.cc +++ b/pc/media_session.cc @@ -270,9 +270,11 @@ static StreamParamsVec GetCurrentStreamParams( // Filters the data codecs for the data channel type. void FilterDataCodecs(std::vector* codecs, bool sctp) { - // Filter RTP codec for SCTP and vice versa. - const char* codec_name = - sctp ? kGoogleRtpDataCodecName : kGoogleSctpDataCodecName; + // Filter RTP codec for SCTP. SCTP is not a codec. + if (!sctp) { + return; + } + const char* codec_name = kGoogleRtpDataCodecName; codecs->erase(std::remove_if(codecs->begin(), codecs->end(), [&codec_name](const DataCodec& codec) { return absl::EqualsIgnoreCase(codec.name,