From db1fae46d89265bfbaa192b52030fbf6ad79263e Mon Sep 17 00:00:00 2001 From: Alessio Bazzica Date: Tue, 28 Feb 2023 11:49:28 +0000 Subject: [PATCH] Reland "Remove ISAC media constant and payload type mapping" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit b79b74e08b45897a1897356e882f33624afc02bd. Reason for revert: downstream fixed Original change's description: > Revert "Remove ISAC media constant and payload type mapping" > > This reverts commit 4c7271aafef89f62381f502f094e2a30421b2498. > > Reason for revert: Breaks downstream test > > Original change's description: > > Remove ISAC media constant and payload type mapping > > > > following the removal of ISAC from the code base. > > > > BUG=webrtc:14450 > > > > Change-Id: I6faab5391bf0ef563c5dcce0bd5d8a653a87d9c8 > > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/294523 > > Reviewed-by: Alessio Bazzica > > Reviewed-by: Harald Alvestrand > > Commit-Queue: Philipp Hancke > > Cr-Commit-Position: refs/heads/main@{#39378} > > Bug: webrtc:14450 > Change-Id: Idccd0ad7a05828f1be6db2071878c64d9bd37f33 > No-Presubmit: true > No-Tree-Checks: true > No-Try: true > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/294742 > Auto-Submit: Björn Terelius > Commit-Queue: Björn Terelius > Bot-Commit: rubber-stamper@appspot.gserviceaccount.com > Owners-Override: Björn Terelius > Cr-Commit-Position: refs/heads/main@{#39380} Bug: webrtc:14450 Change-Id: I31a9b1873d0197a44d1a3da1d8c40a3a0fa15986 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/295502 Bot-Commit: rubber-stamper@appspot.gserviceaccount.com Reviewed-by: Alessio Bazzica Reviewed-by: Harald Alvestrand Reviewed-by: Björn Terelius Commit-Queue: Alessio Bazzica Reviewed-by: Jeremy Leconte Cr-Commit-Position: refs/heads/main@{#39419} --- media/base/media_constants.cc | 1 - media/base/media_constants.h | 1 - media/engine/payload_type_mapper.cc | 2 -- media/engine/payload_type_mapper_unittest.cc | 2 -- sdk/objc/api/peerconnection/RTCRtpCodecParameters.mm | 1 - 5 files changed, 7 deletions(-) diff --git a/media/base/media_constants.cc b/media/base/media_constants.cc index 2f29a2036b..f91ac33c90 100644 --- a/media/base/media_constants.cc +++ b/media/base/media_constants.cc @@ -44,7 +44,6 @@ const char kCodecParamAssociatedCodecName[] = "acn"; const char kCodecParamNotInNameValueFormat[] = ""; const char kOpusCodecName[] = "opus"; -const char kIsacCodecName[] = "ISAC"; const char kL16CodecName[] = "L16"; const char kG722CodecName[] = "G722"; const char kIlbcCodecName[] = "ILBC"; diff --git a/media/base/media_constants.h b/media/base/media_constants.h index f843d50ce5..ca3213ea0f 100644 --- a/media/base/media_constants.h +++ b/media/base/media_constants.h @@ -45,7 +45,6 @@ extern const char kCodecParamAssociatedCodecName[]; extern const char kCodecParamNotInNameValueFormat[]; extern const char kOpusCodecName[]; -extern const char kIsacCodecName[]; extern const char kL16CodecName[]; extern const char kG722CodecName[]; extern const char kIlbcCodecName[]; diff --git a/media/engine/payload_type_mapper.cc b/media/engine/payload_type_mapper.cc index c63d1d7221..66c48a776b 100644 --- a/media/engine/payload_type_mapper.cc +++ b/media/engine/payload_type_mapper.cc @@ -62,8 +62,6 @@ PayloadTypeMapper::PayloadTypeMapper() // Payload type assignments currently used by WebRTC. // Includes data to reduce collisions (and thus reassignments) {{kIlbcCodecName, 8000, 1}, 102}, - {{kIsacCodecName, 16000, 1}, 103}, - {{kIsacCodecName, 32000, 1}, 104}, {{kCnCodecName, 16000, 1}, 105}, {{kCnCodecName, 32000, 1}, 106}, {{kOpusCodecName, diff --git a/media/engine/payload_type_mapper_unittest.cc b/media/engine/payload_type_mapper_unittest.cc index 90e113c7b6..92253a0f5d 100644 --- a/media/engine/payload_type_mapper_unittest.cc +++ b/media/engine/payload_type_mapper_unittest.cc @@ -50,8 +50,6 @@ TEST_F(PayloadTypeMapperTest, WebRTCPayloadTypes) { // Tests that the payload mapper knows about the audio formats we've // been using in WebRTC, with their hard coded values. EXPECT_EQ(102, mapper_.FindMappingFor({kIlbcCodecName, 8000, 1})); - EXPECT_EQ(103, mapper_.FindMappingFor({kIsacCodecName, 16000, 1})); - EXPECT_EQ(104, mapper_.FindMappingFor({kIsacCodecName, 32000, 1})); EXPECT_EQ(105, mapper_.FindMappingFor({kCnCodecName, 16000, 1})); EXPECT_EQ(106, mapper_.FindMappingFor({kCnCodecName, 32000, 1})); EXPECT_EQ(111, mapper_.FindMappingFor( diff --git a/sdk/objc/api/peerconnection/RTCRtpCodecParameters.mm b/sdk/objc/api/peerconnection/RTCRtpCodecParameters.mm index 753667b635..6201e57b93 100644 --- a/sdk/objc/api/peerconnection/RTCRtpCodecParameters.mm +++ b/sdk/objc/api/peerconnection/RTCRtpCodecParameters.mm @@ -21,7 +21,6 @@ const NSString * const kRTCRedCodecName = @(cricket::kRedCodecName); const NSString * const kRTCUlpfecCodecName = @(cricket::kUlpfecCodecName); const NSString * const kRTCFlexfecCodecName = @(cricket::kFlexfecCodecName); const NSString * const kRTCOpusCodecName = @(cricket::kOpusCodecName); -const NSString * const kRTCIsacCodecName = @(cricket::kIsacCodecName); const NSString * const kRTCL16CodecName = @(cricket::kL16CodecName); const NSString * const kRTCG722CodecName = @(cricket::kG722CodecName); const NSString * const kRTCIlbcCodecName = @(cricket::kIlbcCodecName);