From 9ea2147e5cbde3fd71a3c20353494a7e356ac98a Mon Sep 17 00:00:00 2001 From: "henrik.lundin" Date: Tue, 13 Oct 2015 06:27:57 -0700 Subject: [PATCH] Delete iSAC-fb from AudioCodingModule This is no longer used. Related code in NetEq and the iSAC codec itself will be deleted in follow-up CLs. BUG=4210 Review URL: https://codereview.webrtc.org/1404623002 Cr-Commit-Position: refs/heads/master@{#10264} --- webrtc/modules/audio_coding/main/acm2/acm_codec_database.cc | 3 --- webrtc/modules/audio_coding/main/acm2/acm_codec_database.h | 2 -- webrtc/modules/audio_coding/main/acm2/acm_common_defs.h | 1 - webrtc/modules/audio_coding/main/acm2/acm_receive_test.cc | 2 -- .../audio_coding/main/acm2/acm_receive_test_oldapi.cc | 3 --- .../modules/audio_coding/main/acm2/acm_receiver_unittest.cc | 2 +- .../audio_coding/main/acm2/acm_receiver_unittest_oldapi.cc | 2 +- .../audio_coding/main/acm2/audio_coding_module_impl.cc | 5 ----- 8 files changed, 2 insertions(+), 18 deletions(-) diff --git a/webrtc/modules/audio_coding/main/acm2/acm_codec_database.cc b/webrtc/modules/audio_coding/main/acm2/acm_codec_database.cc index 9193270363..bf12530832 100644 --- a/webrtc/modules/audio_coding/main/acm2/acm_codec_database.cc +++ b/webrtc/modules/audio_coding/main/acm2/acm_codec_database.cc @@ -68,7 +68,6 @@ const CodecInst ACMCodecDB::database_[] = { {103, "ISAC", 16000, kIsacPacSize480, 1, kIsacWbDefaultRate}, # if (defined(WEBRTC_CODEC_ISAC)) {104, "ISAC", 32000, kIsacPacSize960, 1, kIsacSwbDefaultRate}, - {105, "ISAC", 48000, kIsacPacSize1440, 1, kIsacSwbDefaultRate}, # endif #endif // Mono @@ -124,7 +123,6 @@ const ACMCodecDB::CodecSettings ACMCodecDB::codec_settings_[] = { {2, {kIsacPacSize480, kIsacPacSize960}, 0, 1}, # if (defined(WEBRTC_CODEC_ISAC)) {1, {kIsacPacSize960}, 0, 1}, - {1, {kIsacPacSize1440}, 0, 1}, # endif #endif // Mono @@ -178,7 +176,6 @@ const NetEqDecoder ACMCodecDB::neteq_decoders_[] = { kDecoderISAC, # if (defined(WEBRTC_CODEC_ISAC)) kDecoderISACswb, - kDecoderISACfb, # endif #endif // Mono diff --git a/webrtc/modules/audio_coding/main/acm2/acm_codec_database.h b/webrtc/modules/audio_coding/main/acm2/acm_codec_database.h index 3ac4c5b3a9..13b300851f 100644 --- a/webrtc/modules/audio_coding/main/acm2/acm_codec_database.h +++ b/webrtc/modules/audio_coding/main/acm2/acm_codec_database.h @@ -35,7 +35,6 @@ class ACMCodecDB { , kISAC # if (defined(WEBRTC_CODEC_ISAC)) , kISACSWB - , kISACFB # endif #endif // Mono @@ -81,7 +80,6 @@ class ACMCodecDB { // Set unsupported codecs to -1 #ifndef WEBRTC_CODEC_ISAC enum {kISACSWB = -1}; - enum {kISACFB = -1}; # ifndef WEBRTC_CODEC_ISACFX enum {kISAC = -1}; # endif diff --git a/webrtc/modules/audio_coding/main/acm2/acm_common_defs.h b/webrtc/modules/audio_coding/main/acm2/acm_common_defs.h index df67ce2914..23e3519ed0 100644 --- a/webrtc/modules/audio_coding/main/acm2/acm_common_defs.h +++ b/webrtc/modules/audio_coding/main/acm2/acm_common_defs.h @@ -26,7 +26,6 @@ const int kIsacWbDefaultRate = 32000; const int kIsacSwbDefaultRate = 56000; const int kIsacPacSize480 = 480; const int kIsacPacSize960 = 960; -const int kIsacPacSize1440 = 1440; } // namespace webrtc diff --git a/webrtc/modules/audio_coding/main/acm2/acm_receive_test.cc b/webrtc/modules/audio_coding/main/acm2/acm_receive_test.cc index e01b263127..85678cf220 100644 --- a/webrtc/modules/audio_coding/main/acm2/acm_receive_test.cc +++ b/webrtc/modules/audio_coding/main/acm2/acm_receive_test.cc @@ -46,7 +46,6 @@ void AcmReceiveTest::RegisterDefaultCodecs() { #endif #ifdef WEBRTC_CODEC_ISAC ASSERT_TRUE(acm_->RegisterReceiveCodec(acm2::ACMCodecDB::kISACSWB, 104)); - ASSERT_TRUE(acm_->RegisterReceiveCodec(acm2::ACMCodecDB::kISACFB, 105)); #endif ASSERT_TRUE(acm_->RegisterReceiveCodec(acm2::ACMCodecDB::kPCM16B, 107)); ASSERT_TRUE(acm_->RegisterReceiveCodec(acm2::ACMCodecDB::kPCM16Bwb, 108)); @@ -79,7 +78,6 @@ void AcmReceiveTest::RegisterNetEqTestCodecs() { ASSERT_TRUE(acm_->RegisterReceiveCodec(acm2::ACMCodecDB::kISAC, 103)); #ifndef WEBRTC_ANDROID ASSERT_TRUE(acm_->RegisterReceiveCodec(acm2::ACMCodecDB::kISACSWB, 104)); - ASSERT_TRUE(acm_->RegisterReceiveCodec(acm2::ACMCodecDB::kISACFB, 124)); #endif ASSERT_TRUE(acm_->RegisterReceiveCodec(acm2::ACMCodecDB::kPCM16B, 93)); ASSERT_TRUE(acm_->RegisterReceiveCodec(acm2::ACMCodecDB::kPCM16Bwb, 94)); diff --git a/webrtc/modules/audio_coding/main/acm2/acm_receive_test_oldapi.cc b/webrtc/modules/audio_coding/main/acm2/acm_receive_test_oldapi.cc index 2a0bbe15d4..e73be5c2ba 100644 --- a/webrtc/modules/audio_coding/main/acm2/acm_receive_test_oldapi.cc +++ b/webrtc/modules/audio_coding/main/acm2/acm_receive_test_oldapi.cc @@ -47,7 +47,6 @@ bool ModifyAndUseThisCodec(CodecInst* codec_param) { // iLBC = 102 // iSAC wideband = 103 // iSAC super-wideband = 104 -// iSAC fullband = 124 // AVT/DTMF = 106 // RED = 117 // PCM16b 8 kHz = 93 @@ -78,8 +77,6 @@ bool RemapPltypeAndUseThisCodec(const char* plname, *pltype = 103; } else if (STR_CASE_CMP(plname, "ISAC") == 0 && plfreq == 32000) { *pltype = 104; - } else if (STR_CASE_CMP(plname, "ISAC") == 0 && plfreq == 48000) { - *pltype = 124; } else if (STR_CASE_CMP(plname, "telephone-event") == 0) { *pltype = 106; } else if (STR_CASE_CMP(plname, "red") == 0) { diff --git a/webrtc/modules/audio_coding/main/acm2/acm_receiver_unittest.cc b/webrtc/modules/audio_coding/main/acm2/acm_receiver_unittest.cc index ff9c91115a..9b5c17b847 100644 --- a/webrtc/modules/audio_coding/main/acm2/acm_receiver_unittest.cc +++ b/webrtc/modules/audio_coding/main/acm2/acm_receiver_unittest.cc @@ -244,7 +244,7 @@ TEST_F(AcmReceiverTest, DISABLED_ON_ANDROID(AddCodecRemoveCodec)) { TEST_F(AcmReceiverTest, DISABLED_ON_ANDROID(SampleRate)) { const int kCodecId[] = { - ACMCodecDB::kISAC, ACMCodecDB::kISACSWB, ACMCodecDB::kISACFB, + ACMCodecDB::kISAC, ACMCodecDB::kISACSWB, -1 // Terminator. }; AddSetOfCodecs(kCodecId); diff --git a/webrtc/modules/audio_coding/main/acm2/acm_receiver_unittest_oldapi.cc b/webrtc/modules/audio_coding/main/acm2/acm_receiver_unittest_oldapi.cc index c30eaf0432..0142275846 100644 --- a/webrtc/modules/audio_coding/main/acm2/acm_receiver_unittest_oldapi.cc +++ b/webrtc/modules/audio_coding/main/acm2/acm_receiver_unittest_oldapi.cc @@ -243,7 +243,7 @@ TEST_F(AcmReceiverTestOldApi, DISABLED_ON_ANDROID(AddCodecRemoveCodec)) { TEST_F(AcmReceiverTestOldApi, DISABLED_ON_ANDROID(SampleRate)) { const int kCodecId[] = { - ACMCodecDB::kISAC, ACMCodecDB::kISACSWB, ACMCodecDB::kISACFB, + ACMCodecDB::kISAC, ACMCodecDB::kISACSWB, -1 // Terminator. }; AddSetOfCodecs(kCodecId); diff --git a/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc b/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc index c5d9d3acc7..a652278661 100644 --- a/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc +++ b/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc @@ -1008,11 +1008,6 @@ bool AudioCodingImpl::MapCodecTypeToParameters(int codec_type, *sample_rate_hz = 32000; *channels = 1; break; - case acm2::ACMCodecDB::kISACFB: - *codec_name = "ISAC"; - *sample_rate_hz = 48000; - *channels = 1; - break; #endif #ifdef WEBRTC_CODEC_ILBC case acm2::ACMCodecDB::kILBC: